commit db2337d9d0cd2f921406969eb388a69e27caa14f
author Sangyun Yun <sangyun@google.com> Thu Aug 10 20:45:57 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 10 20:45:57 2023 +0000
tree 28d1a30dadb81827b1ad9183fbc38ec81d46187c
parent f338763d37bbb4e586e28b4629899291b7049eba
parent 7335317c6ac9fe5178b706c62615963d8affd5c1

Merge "Fix to dismiss network selection notification when disable sim." into main

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 11887bb..518003f 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -832,7 +832,8 @@
         Phone phone = SubscriptionManager.isValidPhoneId(phoneId) ?
                 PhoneFactory.getPhone(phoneId) : PhoneFactory.getDefaultPhone();
         if (TelephonyCapabilities.supportsNetworkSelection(phone)) {
-            if (SubscriptionManager.isValidSubscriptionId(subId)) {
+            if (SubscriptionManager.isValidSubscriptionId(subId)
+                    && mSubscriptionManager.isActiveSubId(subId)) {
                 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
                 String selectedNetworkOperatorName =
                         sp.getString(Phone.NETWORK_SELECTION_NAME_KEY + subId, "");

tests/src/com/android/phone/NotificationMgrTest.java

diff --git a/tests/src/com/android/phone/NotificationMgrTest.java b/tests/src/com/android/phone/NotificationMgrTest.java
index e009446..98c6a4a 100644
--- a/tests/src/com/android/phone/NotificationMgrTest.java
+++ b/tests/src/com/android/phone/NotificationMgrTest.java
@@ -631,6 +631,7 @@
                 MOBILE_NETWORK_SELECTION_PACKAGE);
         when(mApp.getString(R.string.mobile_network_settings_class)).thenReturn(
                 MOBILE_NETWORK_SELECTION_CLASS);
+        when(mSubscriptionManager.isActiveSubId(anyInt())).thenReturn(true);
     }
 
     private void moveTimeForward(long seconds) {