Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb (a47aa87a) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -443,18 +443,21 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
		mMin = cdmaSubscription[3];
		mPrlVersion = cdmaSubscription[4];
		Log.d(LOG_TAG,"GET_CDMA_SUBSCRIPTION MDN=" + mMdn);

		mIsMinInfoReady = true;

		int otaspMode = getOtasp();
		int oldOtaspMode = mCurrentOtaspMode;
		mCurrentOtaspMode = otaspMode;

		// Notify apps subscription info is ready
		if (cdmaForSubscriptionInfoReadyRegistrants != null) {
		Log.d(LOG_TAG, "call cdmaForSubscriptionInfoReady.notifyRegistrants()");
		cdmaForSubscriptionInfoReadyRegistrants.notifyRegistrants();
		}
		if (!mIsMinInfoReady) {
		mIsMinInfoReady = true;
		}
		int otaspMode = getOtasp();
		if (mCurrentOtaspMode != otaspMode) {
		if (oldOtaspMode != mCurrentOtaspMode) {
		Log.d(LOG_TAG, "call phone.notifyOtaspChanged old otaspMode=" +
		mCurrentOtaspMode + " new otaspMode=" + otaspMode);
		mCurrentOtaspMode = otaspMode;
		oldOtaspMode + " new otaspMode=" + mCurrentOtaspMode);
		phone.notifyOtaspChanged(mCurrentOtaspMode);
		}
		phone.getIccCard().broadcastIccStateChangedIntent(IccCard.INTENT_VALUE_ICC_IMSI,