Merge "Unlock mUiccCard access in UiccProfile" (33766069) · Commits · e / os / android_frameworks_opt_telephony

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

+15 −15

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ public class UiccProfile extends IccCard {
		new UiccCardApplication[IccCardStatus.CARD_MAX_APPS];
		private Context mContext;
		private CommandsInterface mCi;
		private UiccCard mUiccCard; //parent
		private final UiccCard mUiccCard; //parent
		private CatService mCatService;
		private UiccCarrierPrivilegeRules mCarrierPrivilegeRules;
		private boolean mDisposed = false;
		@@ -242,15 +242,16 @@ public class UiccProfile extends IccCard {
		* Dispose the UiccProfile.
		*/
		public void dispose() {
		synchronized (mLock) {
		if (DBG) log("Disposing profile");

		unregisterAllAppEvents();
		unregisterCurrAppEvents();

		// mUiccCard is outside of mLock in order to prevent deadlocking. This is safe because
		// EuiccCard#unregisterForEidReady handles its own lock
		if (mUiccCard instanceof EuiccCard) {
		((EuiccCard) mUiccCard).unregisterForEidReady(mHandler);
		}
		synchronized (mLock) {
		unregisterAllAppEvents();
		unregisterCurrAppEvents();

		mCi.unregisterForOffOrNotAvailable(mHandler);
		mContext.unregisterReceiver(mReceiver);
		@@ -849,8 +850,8 @@ public class UiccProfile extends IccCard {

		@Override
		public boolean hasIccCard() {
		synchronized (mLock) {
		if (mUiccCard != null && mUiccCard.getCardState()
		// mUiccCard is initialized in constructor, so won't be null
		if (mUiccCard.getCardState()
		!= IccCardStatus.CardState.CARDSTATE_ABSENT) {
		return true;
		}
		@@ -858,7 +859,6 @@ public class UiccProfile extends IccCard {
		+ "ABSENT");
		return false;
		}
		}

		/**
		* Update the UiccProfile.