commit b0184374a828c264dd59385878dc2d1475b4a58c
author Aishwarya Mallampati <amallampati@google.com> Wed Jun 14 16:59:34 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 14 16:59:34 2023 +0000
tree 5c69b7e216c4fdb60b8f9fdd6afd84ca9f9bdcc2
parent f730b9a1f65f16485d7c2e5de48e48db464f6383
parent 99a574c16a68177ebbeb2d88d0214b4dc203890c

Merge "Notify waiters even if mMaxAdnCapacity of SIM is 0." am: 9e80acc9b9 am: 043f4b9fcb am: 99a574c16a

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2596633

Change-Id: I70d1294d44bdf2657201285b3e281aecda467507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/java/com/android/internal/telephony/uicc/SimPhonebookRecordCache.java

diff --git a/src/java/com/android/internal/telephony/uicc/SimPhonebookRecordCache.java b/src/java/com/android/internal/telephony/uicc/SimPhonebookRecordCache.java
index 149e605..b1fc473 100644
--- a/src/java/com/android/internal/telephony/uicc/SimPhonebookRecordCache.java
+++ b/src/java/com/android/internal/telephony/uicc/SimPhonebookRecordCache.java
@@ -446,6 +446,7 @@
                 notifyAdnLoadingWaiters();
                 tryFireUpdatePendingList();
             } else {
+                notifyAdnLoadingWaiters();
                 logd("ADN capacity is invalid");
             }
             mIsInitialized.set(true); // Let's say the whole process is ready
@@ -455,6 +456,9 @@
                 mIsCacheInvalidated.set(false);
                 notifyAdnLoadingWaiters();
                 tryFireUpdatePendingList();
+            } else if (!newCapacity.isSimValid()) {
+                mIsCacheInvalidated.set(false);
+                notifyAdnLoadingWaiters();
             } else if (!mIsUpdateDone && !newCapacity.isSimEmpty()) {
                 invalidateSimPbCache();
                 fillCacheWithoutWaiting();