commit 7335317c6ac9fe5178b706c62615963d8affd5c1
author sangyun <sangyun@google.com> Wed Aug 09 04:12:34 2023 +0900
committer sangyun <sangyun@google.com> Wed Aug 09 07:41:57 2023 +0900
tree 7d6d5d235940031314968621c1f36d5699af667b
parent 7f2b75fc93dd11edb9cf32612f127447bd5fa1b8

Fix to dismiss network selection notification when disable sim.

The network selection notification(Selected network unavailable)
couldn't be dismissed and remained when sim is disabled, since
disabled sim card has valid subId but not active.
Added inactive subId condition to dismiss notification.

Bug: 291697598
Test: atest NotificationMgrTest
Test: manually tested with AT&T and Fi sim card.
Change-Id: I3035b426560c9fa881f0867e9cc9bb01f20f5017

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 60287e5..b044a61 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -817,7 +817,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, "");