Merge cherrypicks of [11361055, 11362850, 11362385, 11362386, 11362870] into qt-d4-releaseandroid-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android10-d4-release

Change-Id: If05fcacca0e9aa7f70546a317ca332bf4c92b2dc

2 files changed, 16 insertions, 20 deletions

diff --git a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
index 703cbc6f9e..5e336ea153 100644
--- a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
+++ b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
@@ -359,26 +359,21 @@ public class SubscriptionInfoUpdater extends Handler {
             mIccId[slotId] = null;
         }
 
-        String iccId = mIccId[slotId];
-        if (iccId == null) {
-            IccCard iccCard = mPhone[slotId].getIccCard();
-            if (iccCard == null) {
-                logd("handleSimLocked: IccCard null");
-                return;
-            }
-            IccRecords records = iccCard.getIccRecords();
-            if (records == null) {
-                logd("handleSimLocked: IccRecords null");
-                return;
-            }
-            if (IccUtils.stripTrailingFs(records.getFullIccId()) == null) {
-                logd("handleSimLocked: IccID null");
-                return;
-            }
-            mIccId[slotId] = IccUtils.stripTrailingFs(records.getFullIccId());
-        } else {
-            logd("NOT Querying IccId its already set sIccid[" + slotId + "]=" + iccId);
+        IccCard iccCard = mPhone[slotId].getIccCard();
+        if (iccCard == null) {
+            logd("handleSimLocked: IccCard null");
+            return;
         }
+        IccRecords records = iccCard.getIccRecords();
+        if (records == null) {
+            logd("handleSimLocked: IccRecords null");
+            return;
+        }
+        if (IccUtils.stripTrailingFs(records.getFullIccId()) == null) {
+            logd("handleSimLocked: IccID null");
+            return;
+        }
+        mIccId[slotId] = IccUtils.stripTrailingFs(records.getFullIccId());
 
         updateSubscriptionInfoByIccId(slotId, true /* updateEmbeddedSubs */);
 
diff --git a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
index e3b620cedd..551ca406e7 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
@@ -461,7 +461,8 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
     @Test
     @SmallTest
     public void testSimLockWithIccId() throws Exception {
-        /* no need for IccId query */
+        // ICCID will be queried even if it is already available
+        doReturn("98106240020000000000").when(mIccRecord).getFullIccId();
 
         replaceInstance(SubscriptionInfoUpdater.class, "mIccId", null,
                 new String[]{"89012604200000000000"});