Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb

Browse Source 
* commit 'a47aa87a19c733e28d9d2db1c4eb7f29d668db7b':
  Set mIsMinInfoReady and mCurrentOtasp before notifcations.
This commit is contained in:
Wink Saville
2011-01-15 10:13:07 -08:00
committed by Android Git Automerger
parent 18f52d533d a47aa87a19
commit eb73112312
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -443,18 +443,21 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
mMin = cdmaSubscription[3]; mMin = cdmaSubscription[3];
mPrlVersion = cdmaSubscription[4]; mPrlVersion = cdmaSubscription[4];
Log.d(LOG_TAG,"GET_CDMA_SUBSCRIPTION MDN=" + mMdn); 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 // Notify apps subscription info is ready
if (cdmaForSubscriptionInfoReadyRegistrants != null) { if (cdmaForSubscriptionInfoReadyRegistrants != null) {
Log.d(LOG_TAG, "call cdmaForSubscriptionInfoReady.notifyRegistrants()");
cdmaForSubscriptionInfoReadyRegistrants.notifyRegistrants(); cdmaForSubscriptionInfoReadyRegistrants.notifyRegistrants();
} }
if (!mIsMinInfoReady) { if (oldOtaspMode != mCurrentOtaspMode) {
mIsMinInfoReady = true;
}
int otaspMode = getOtasp();
if (mCurrentOtaspMode != otaspMode) {
Log.d(LOG_TAG, "call phone.notifyOtaspChanged old otaspMode=" + Log.d(LOG_TAG, "call phone.notifyOtaspChanged old otaspMode=" +
mCurrentOtaspMode + " new otaspMode=" + otaspMode); oldOtaspMode + " new otaspMode=" + mCurrentOtaspMode);
mCurrentOtaspMode = otaspMode;
phone.notifyOtaspChanged(mCurrentOtaspMode); phone.notifyOtaspChanged(mCurrentOtaspMode);
} }
phone.getIccCard().broadcastIccStateChangedIntent(IccCard.INTENT_VALUE_ICC_IMSI, phone.getIccCard().broadcastIccStateChangedIntent(IccCard.INTENT_VALUE_ICC_IMSI,