From fd39f04d492aeac056028d6f0d0626cdfc3aa647 Mon Sep 17 00:00:00 2001 From: Aishwarya Mallamapti Date: Thu, 27 Jul 2023 18:53:54 +0000 Subject: Check mAdnCache is not null before loading FDN. Bug: 292467876 Test: Manual Verification: - Enable FDN - reboot device - After reboot, no crashes were observed - Performed basic functionality tests after reboot such as making calls and sending sms using the sim card. - QA verified and informed that fix is working: b/292467876#comment18 Change-Id: Id4909881f9f6ac509c60889557652632f00a8523 (cherry picked from commit 886684aa255b8564bb132a4b83202c6bcb5981ed) --- src/java/com/android/internal/telephony/uicc/IccRecords.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java index f80369675a..ae93b09283 100644 --- a/src/java/com/android/internal/telephony/uicc/IccRecords.java +++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java @@ -1687,7 +1687,7 @@ public abstract class IccRecords extends Handler implements IccConstants { } public void loadFdnRecords() { - if (mParentApp != null) { + if (mParentApp != null && mAdnCache != null) { log("Loading FdnRecords"); mAdnCache.requestLoadAllAdnLike(IccConstants.EF_FDN, EF_EXT2, obtainMessage(EVENT_GET_FDN_DONE)); -- cgit v1.2.3