commit 8db7c3bace348dd14fb71b1059852857ff06a8aa
author Ling Ma <linggm@google.com> Wed Aug 14 13:43:32 2024 -0700
committer Ling Ma <linggm@google.com> Wed Aug 14 13:43:42 2024 -0700
tree 0679405b16404b07d7ce6fb43f24371cdd84e329
parent 18515d1b1294297510671a9fced00d86b64caefd

Check default phone made instead of user for access

Fix: 357766332
Test: manual launch
Test: data browsing + voice call
Flag: EXEMPT bugfix
Change-Id: Ibfae10376b8eaafbc6b8d59b2c0dede15ae2a5fe

src/com/android/phone/settings/RadioInfo.java

diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index 9d8f070..6be15f3 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -206,7 +206,7 @@
             ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA,
             ServiceState.RIL_RADIO_TECHNOLOGY_NR
     };
-    private static String[] sPhoneIndexLabels;
+    private static String[] sPhoneIndexLabels = new String[0];
 
     private static final int sCellInfoListRateDisabled = Integer.MAX_VALUE;
     private static final int sCellInfoListRateMax = 0;
@@ -547,8 +547,10 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        if (!android.os.Process.myUserHandle().isSystem()) {
-            Log.e(TAG, "Not run from system user, don't do anything.");
+        try {
+            PhoneFactory.getDefaultPhone();
+        } catch (Exception e) {
+            loge("Do nothing due to getDefaultPhone " + e);
             finish();
             return;
         }