am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager" (7b5e41b5) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
		private int updateEfForIccType(int efid) {
		// Check if we are trying to read ADN records
		if (efid == IccConstants.EF_ADN) {
		if (phone.getIccCard().isApplicationOnIcc(AppType.APPTYPE_USIM)) {
		if (phone.getCurrentUiccAppType() == AppType.APPTYPE_USIM) {
		return IccConstants.EF_PBR;
		}
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.util.Log;

		import com.android.internal.R;
		import com.android.internal.telephony.IccCardApplicationStatus.AppState;
		import com.android.internal.telephony.IccCardApplicationStatus.AppType;
		import com.android.internal.telephony.gsm.UsimServiceTable;
		import com.android.internal.telephony.ims.IsimRecords;
		import com.android.internal.telephony.test.SimulatedRadioControl;
		@@ -681,6 +682,14 @@ public abstract class PhoneBase extends Handler implements Phone {
		return null;
		}

		public AppType getCurrentUiccAppType() {
		UiccCardApplication currentApp = mUiccApplication.get();
		if (currentApp != null) {
		return currentApp.getType();
		}
		return AppType.APPTYPE_UNKNOWN;
		}

		@Override
		public IccCard getIccCard() {
		return null;