commit a856441e56ce0a58ec0867aebe741391859b2134
author Tomasz Wasilczyk <twasilczyk@google.com> Thu May 23 13:30:23 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu May 30 20:05:35 2024 +0000
tree 8153bdcb9f8d9d4f08fa7b8fcd0b7cc66f0b725b
parent 5b3044f3faf3dd415ffd80ba97068ee6457a32f2

PhoneGlobals: skip checking telephony feature for certain devices

Bug: 331855229
Test: connect BT phone and check messages
Flag: com.android.internal.telephony.flags.enforce_telephony_feature_mapping_for_public_apis
Change-Id: I97afa021e33588ea8331eab2e48103a1efbb980b

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 4e077e9..6b85016 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -518,7 +518,9 @@
 
         ContentResolver resolver = getContentResolver();
 
-        if (mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()) {
+        if (mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()
+                && !getResources().getBoolean(
+                    com.android.internal.R.bool.config_force_phone_globals_creation)) {
             if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
                 Log.v(LOG_TAG, "onCreate()... but not defined FEATURE_TELEPHONY");
                 return;