Merge cherrypicks of ['googleplex-android-review.googlesource.com/24377542']...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24377542'] into sparse-10615833-L02900000962494793.
SPARSE_CHANGE: Id4909881f9f6ac509c60889557652632f00a8523

Change-Id: If2027fe9fd68038421b486c9b8caf5b72a262ca0

parents be1db32a 06a11f27

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));