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

Merge change 23548 into eclair

Browse Source 
* changes:
  Fix some sign in errors.
This commit is contained in:
Android (Google) Code Review
2009-09-02 13:01:59 -07:00
parent 0a29985895 5b462477a9
commit 8ecd2aecf6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/accounts/AccountManagerService.java
View File

@@ -1397,7 +1397,7 @@ public class AccountManagerService extends IAccountManager.Stub {
Log.v(TAG, "current IMSI=" + imsi + "; stored IMSI=" + storedImsi); Log.v(TAG, "current IMSI=" + imsi + "; stored IMSI=" + storedImsi);
} }
if (!imsi.equals(storedImsi) && !"initial".equals(storedImsi)) { if (!imsi.equals(storedImsi) && !TextUtils.isEmpty(storedImsi)) {
if (Log.isLoggable(TAG, Log.VERBOSE)) { if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG, "wiping all passwords and authtokens"); Log.v(TAG, "wiping all passwords and authtokens");
} }

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

@@ -46,6 +46,7 @@ import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.CommandsInterface;
import com.android.internal.telephony.DataConnectionTracker; import com.android.internal.telephony.DataConnectionTracker;
import com.android.internal.telephony.gsm.MccTable; import com.android.internal.telephony.gsm.MccTable;
import com.android.internal.telephony.IccCard;
import com.android.internal.telephony.PhoneProxy; import com.android.internal.telephony.PhoneProxy;
import com.android.internal.telephony.ServiceStateTracker; import com.android.internal.telephony.ServiceStateTracker;
import com.android.internal.telephony.TelephonyEventLog; import com.android.internal.telephony.TelephonyEventLog;
@@ -443,6 +444,8 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
if (!mIsMinInfoReady) { if (!mIsMinInfoReady) {
mIsMinInfoReady = true; mIsMinInfoReady = true;
} }
phone.getIccCard().broadcastIccStateChangedIntent(IccCard.INTENT_VALUE_ICC_IMSI,
null);
} else { } else {
Log.w(LOG_TAG,"error parsing cdmaSubscription params num=" Log.w(LOG_TAG,"error parsing cdmaSubscription params num="
+ cdmaSubscription.length); + cdmaSubscription.length);