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

Commit 3f0e441b authored by Takanori Nakano's avatar Takanori Nakano Committed by Yoshiaki Naka
Browse files

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

The device attempts to display the dialog to prompt user to restart the
device, but it is unnecessary if the device is already in the shutdown
procedure.

Bug: 123387537
Test: Manual

Change-Id: I523dc9a9d06f9757aeeabb4512af6087ced113e4
parent ca77bef0

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);