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

Commit efa35f1c authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

Merge "Restarting the device must be triggered even in the airplane mode" am:... 

Merge "Restarting the device must be triggered even in the airplane mode" am: 898b4cca am: e4f18837
am: 669db16d

Change-Id: Ia226bd19016ad9decbfea036dbab1639ff949e80
parents 95d9393f 669db16d

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

+6 −6
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ public class UiccSlot extends Handler { 
            //   2. The latest mCardState is not ABSENT, but there is no UiccCard instance.

            } else if ((oldState == null || oldState == CardState.CARDSTATE_ABSENT

                    || mUiccCard == null) && mCardState != CardState.CARDSTATE_ABSENT) {

                // No notifications while radio is off or we just powering up

                if (radioState == TelephonyManager.RADIO_POWER_ON

                        && mLastRadioState == TelephonyManager.RADIO_POWER_ON) {

                // No notification while we are just powering up

                if (radioState != TelephonyManager.RADIO_POWER_UNAVAILABLE

                        && mLastRadioState != TelephonyManager.RADIO_POWER_UNAVAILABLE) {

                    if (DBG) log("update: notify card added");

                    sendMessage(obtainMessage(EVENT_CARD_ADDED, null));

                }
@@ -183,9 +183,9 @@ public class UiccSlot extends Handler { 
    private void updateCardStateAbsent() {

        int radioState =

                (mCi == null) ? TelephonyManager.RADIO_POWER_UNAVAILABLE : mCi.getRadioState();

        // No notifications while radio is off or we just powering up

        if (radioState == TelephonyManager.RADIO_POWER_ON

                && mLastRadioState == TelephonyManager.RADIO_POWER_ON) {

        // No notification while we are just powering up

        if (radioState != TelephonyManager.RADIO_POWER_UNAVAILABLE

                && mLastRadioState != TelephonyManager.RADIO_POWER_UNAVAILABLE) {

            if (DBG) log("update: notify card removed");

            sendMessage(obtainMessage(EVENT_CARD_REMOVED, null));

        }