Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ecd2aec authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23548 into eclair 

* changes:
  Fix some sign in errors.
parents 0a299858 5b462477

core/java/android/accounts/AccountManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ public class AccountManagerService extends IAccountManager.Stub { 
                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)) {

                    Log.v(TAG, "wiping all passwords and authtokens");

                }

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

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.internal.telephony.CommandException; 
import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.DataConnectionTracker;

import com.android.internal.telephony.gsm.MccTable;

import com.android.internal.telephony.IccCard;

import com.android.internal.telephony.PhoneProxy;

import com.android.internal.telephony.ServiceStateTracker;

import com.android.internal.telephony.TelephonyEventLog;
@@ -443,6 +444,8 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 
                    if (!mIsMinInfoReady) {

                        mIsMinInfoReady = true;

                    }

                    phone.getIccCard().broadcastIccStateChangedIntent(IccCard.INTENT_VALUE_ICC_IMSI,

                            null);

                } else {

                    Log.w(LOG_TAG,"error parsing cdmaSubscription params num="

                            + cdmaSubscription.length);