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

Commit 66173d51 authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" am:... 

Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" am: c1b980a1 am: 6e4d493e am: d2575e75
am: 49bd9dc0

Change-Id: Ie65171f68d5e2e691d7f359a734b8ef711bcae30
parents 0ab6d8cd 49bd9dc0

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

+4 −7
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.os.Handler; 
import android.os.Message;

import android.os.Registrant;

import android.os.RegistrantList;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.telephony.Rlog;

import android.telephony.ServiceState;
@@ -37,14 +36,13 @@ import android.text.TextUtils; 
import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.IccCard;

import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.MccTable;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.PersoSubState;

import com.android.internal.telephony.uicc.IccCardStatus.CardState;
@@ -420,9 +418,8 @@ public class IccCardProxy extends Handler implements IccCard { 
                if (mUiccApplication.getPersoSubState() ==

                        PersoSubState.PERSOSUBSTATE_SIM_NETWORK) {

                    setExternalState(State.NETWORK_LOCKED);

                } else {

                    setExternalState(State.UNKNOWN);

                }

                // Otherwise don't change external SIM state.

                break;

            case APPSTATE_READY:

                setExternalState(State.READY);