commit 406b9b3fd7a32f687a3f30bca977c05f40bc8f14
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Jul 10 15:45:21 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Tue Jul 30 01:21:35 2024 -0700
tree 441fb9204c3aaffd4fb68a47471018e7d87c11d1
parent 6097422d4d933253b674ad814a5051435d7d89aa

Fix more crashes during partial telephony stack boot - round 2

Bug: 331855229
Flag: EXEMPT bugfix
Test: atest CarWatchdogManagerTest
      on aosp_cf_x86_64_only_phone-trunk_staging-userdebug
Change-Id: I9dd676b4a0805dfacc04ab6f47982c3329951b4b

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6dc2add..e920939 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7581,8 +7581,11 @@
             }
         }
 
-        enforceTelephonyFeatureWithException(getCurrentPackageName(),
-                PackageManager.FEATURE_TELEPHONY_DATA, "isDataEnabledForReason");
+        if (!mApp.getResources().getBoolean(
+                    com.android.internal.R.bool.config_force_phone_globals_creation)) {
+            enforceTelephonyFeatureWithException(getCurrentPackageName(),
+                    PackageManager.FEATURE_TELEPHONY_DATA, "isDataEnabledForReason");
+        }
 
         final long identity = Binder.clearCallingIdentity();
         try {
@@ -7669,9 +7672,12 @@
     public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) {
         enforceReadPrivilegedPermission("checkCarrierPrivilegesForPackageAnyPhone");
 
-        enforceTelephonyFeatureWithException(getCurrentPackageName(),
-                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION,
-                "checkCarrierPrivilegesForPackageAnyPhone");
+        if (!mApp.getResources().getBoolean(
+                    com.android.internal.R.bool.config_force_phone_globals_creation)) {
+            enforceTelephonyFeatureWithException(getCurrentPackageName(),
+                    PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION,
+                    "checkCarrierPrivilegesForPackageAnyPhone");
+        }
 
         return checkCarrierPrivilegesForPackageAnyPhoneWithPermission(pkgName);
     }