commit e99cfc38e5be92003f8bcd98262409a1c066d536
author sivaramireddy <sivaramireddy@google.com> Thu Nov 07 09:48:37 2024 +0000
committer Siva Rami Reddy S (xWF) <sivaramireddy@google.com> Wed Nov 13 05:40:18 2024 +0000
tree 5c82fd296f531b435e142ccddbc6fcd115c17a62
parent 97403d267bf5f5d264c4a970f81ef44935076c04

Fix NPE at RadioInfo

Bug: 377352719
Test: atest and device test
Flag: EXEMPT bugfix.
Change-Id: I968b8e3d05bf0fe7c0a377667acbb14172c40c05

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 579a853..abc7289 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -1414,7 +1414,9 @@
     }
 
     private void updateNetworkType() {
-        if (SubscriptionManager.isValidPhoneId(mPhoneId)) {
+        SubscriptionManager mSm = getSystemService(SubscriptionManager.class);
+        if (SubscriptionManager.isValidPhoneId(mPhoneId)
+                && mSm.isActiveSubscriptionId(mSubId)) {
             mDataNetwork.setText(ServiceState.rilRadioTechnologyToString(
                     mTelephonyManager.getServiceStateForSlot(mPhoneId)
                             .getRilDataRadioTechnology()));