commit 54a246d9d37bf458b78511c7c5478ef70970da8e
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jul 24 01:29:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 24 01:29:54 2021 +0000
tree c5b91f66287d8690ad015bbe8c26d25a0ea07f26
parent 52c4d731742b67a79ec9d1bcb3645166f3e6a125
parent 59a3670e0e52bba586046206ac7e7cb44e112382

Merge "Update SubscriptionController on NOT_READY only if it is terminal state." into sc-dev

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

diff --git a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
index 0c6cc92..429f7f9 100644
--- a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
+++ b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
@@ -457,10 +457,10 @@
             // At this phase, the subscription list is accessible. Treating NOT_READY
             // as equivalent to ABSENT, once the rest of the system can handle it.
             sIccId[phoneId] = ICCID_STRING_FOR_NO_SIM;
+            updateSubscriptionInfoByIccId(phoneId, false /* updateEmbeddedSubs */);
         } else {
             sIccId[phoneId] = null;
         }
-        updateSubscriptionInfoByIccId(phoneId, false /* updateEmbeddedSubs */);
 
         broadcastSimStateChanged(phoneId, IccCardConstants.INTENT_VALUE_ICC_NOT_READY,
                 null);

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
index c92d4f9..1161792 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
@@ -246,8 +246,8 @@
                 mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);
         verify(mConfigManager, never()).updateConfigForPhoneId(eq(FAKE_PHONE_ID_1),
                 eq(IccCardConstants.INTENT_VALUE_ICC_NOT_READY));
-        verify(mSubscriptionController).clearSubInfoRecord(FAKE_PHONE_ID_1);
-        verify(mSubscriptionController).notifySubscriptionInfoChanged();
+        verify(mSubscriptionController, never()).clearSubInfoRecord(FAKE_PHONE_ID_1);
+        verify(mSubscriptionController, never()).notifySubscriptionInfoChanged();
     }
 
     @Test