Merge cherrypicks of ['googleplex-android-review.googlesource.com/24377542'] into udc-release.android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r10android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-release

Change-Id: Ic7cec439f1c54dbe26d1f29a620e04273e489ff9

1 files changed, 1 insertions, 1 deletions

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));