Merge "No need to prompt user to restart device if already shutting down" (a609060a) · Commits · e / os / android_frameworks_opt_telephony

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