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

Commit e50fa2be authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "No need to prompt user to restart device if already shutting down"

parents 2190c3e4 3f0e441b

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

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.view.WindowManager; 
import com.android.internal.R;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.uicc.IccCardStatus.CardState;

import com.android.internal.telephony.uicc.euicc.EuiccCard;
@@ -289,6 +291,13 @@ public class UiccSlot extends Handler { 
            log("onIccSwap: isHotSwapSupported is true, don't prompt for rebooting");

            return;

        }



        Phone phone = PhoneFactory.getPhone(mPhoneId);

        if (phone != null && phone.isShuttingDown()) {

            log("onIccSwap: already doing shutdown, no need to prompt");

            return;

        }



        log("onIccSwap: isHotSwapSupported is false, prompt for rebooting");



        promptForRestart(isAdded);