Merge "Check RescueParty before using SysUI reboot message" into tm-dev (500c65f4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/ShutdownThread.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -315,15 +315,15 @@ public final class ShutdownThread extends Thread {
		com.android.internal.R.string.reboot_to_update_reboot));
		}
		} else if (mReason != null && mReason.equals(PowerManager.REBOOT_RECOVERY)) {
		if (showSysuiReboot()) {
		return null;
		} else if (RescueParty.isAttemptingFactoryReset()) {
		if (RescueParty.isAttemptingFactoryReset()) {
		// We're not actually doing a factory reset yet; we're rebooting
		// to ask the user if they'd like to reset, so give them a less
		// scary dialog message.
		pd.setTitle(context.getText(com.android.internal.R.string.power_off));
		pd.setMessage(context.getText(com.android.internal.R.string.shutdown_progress));
		pd.setIndeterminate(true);
		} else if (showSysuiReboot()) {
		return null;
		} else {
		// Factory reset path. Set the dialog message accordingly.
		pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_reset_title));