commit b426d43629561d031b9c9710d5e1be989e11b342
author Siva Rami Reddy S (xWF) <sivaramireddy@google.com> Wed Nov 13 07:28:02 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 07:28:02 2024 +0000
tree 82dfcbd9f54212665ade1a53aeb49be570170ce2
parent 63b9ac97baf95b891794f7d67d09e2f9eea7cf0d
parent e99cfc38e5be92003f8bcd98262409a1c066d536

Merge "Fix NPE 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 bda4b28..4d98d92 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -1425,7 +1425,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()));