commit 751bb1b14bd07acf1db16557a0f6c5a06c33bbc6
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Jun 04 12:03:46 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Mon Jul 08 13:57:54 2024 -0700
tree f62e740244ec11e2a6aa4a0dd6fb15ced3288b8e
parent d1b5713b7f40470722c3ce56b9132bfd12f901e4

Fix more crashes during partial telephony stack boot

Bug: 331855229
Bug: 344261877
Flag: EXEMPT bugfix
Test: boot cf_x86_64_auto-trunk_staging-userdebug
Test: atest SatelliteEntitlementControllerTest
Change-Id: Ice5839c0834ea4c893140163f4056da314d13ea6

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index d4822ad..7f720c2 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -1344,7 +1344,10 @@
             return new PersistableBundle();
         }
 
-        enforceTelephonyFeatureWithException(callingPackage, "getConfigForSubIdWithFeature");
+        if (!mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_force_phone_globals_creation)) {
+            enforceTelephonyFeatureWithException(callingPackage, "getConfigForSubIdWithFeature");
+        }
 
         int phoneId = SubscriptionManager.getPhoneId(subscriptionId);
         PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();