commit 0483a1490511d6fe05b4a11f8a56b9a5672e33b6
author Siva Rami Reddy S (xWF) <sivaramireddy@google.com> Sat Sep 21 08:06:06 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 21 08:06:06 2024 +0000
tree d3259fbe5c406d1aec4c633a8101c3af10713e55
parent 479d04962db52427e476c8dfbc3ca72bcd2542ad
parent ebc305d0e0bc2a176a1c9aae93c9083c135daa2e

Merge "Fix ArrayIndexOutOfBoundsException at RadioInfo" into main

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 8b004d9..26db4b3 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -362,6 +362,7 @@
     private int mPreferredNetworkTypeResult;
     private int mCellInfoRefreshRateIndex;
     private int mPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;
+    private static final int DEFAULT_PHONE_ID = 0;
 
     private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
 
@@ -584,7 +585,15 @@
             mPhone = getPhone(SubscriptionManager.getDefaultSubscriptionId());
         }
         mSubId = SubscriptionManager.getDefaultSubscriptionId();
-        mPhoneId = SubscriptionManager.getPhoneId(mSubId);
+        if (mPhone != null) {
+            mPhoneId = mPhone.getPhoneId();
+        } else {
+            mPhoneId = SubscriptionManager.getPhoneId(mSubId);
+        }
+        if (!SubscriptionManager.isValidPhoneId(mPhoneId)) {
+            mPhoneId = DEFAULT_PHONE_ID;
+        }
+
         mTelephonyManager = getSystemService(TelephonyManager.class)
                 .createForSubscriptionId(mSubId);
         mEuiccManager = getSystemService(EuiccManager.class);