Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-02 23:39:39 +00:00
committed by Android (Google) Code Review
parent ebc05a6a42 b4f3697ef8
commit 7606d4798b
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/power/ShutdownThread.java
View File

@@ -57,6 +57,7 @@ import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.ITelephony;
import com.android.server.RescueParty;
import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerService;
import java.io.File; import java.io.File;
@@ -293,11 +294,20 @@ public final class ShutdownThread extends Thread {
com.android.internal.R.string.reboot_to_update_reboot)); com.android.internal.R.string.reboot_to_update_reboot));
} }
} else if (mReason != null && mReason.equals(PowerManager.REBOOT_RECOVERY)) { } else if (mReason != null && mReason.equals(PowerManager.REBOOT_RECOVERY)) {
// Factory reset path. Set the dialog message accordingly. if (RescueParty.isAttemptingFactoryReset()) {
pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_reset_title)); // We're not actually doing a factory reset yet; we're rebooting
pd.setMessage(context.getText( // to ask the user if they'd like to reset, so give them a less
com.android.internal.R.string.reboot_to_reset_message)); // scary dialog message.
pd.setIndeterminate(true); 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 {
// Factory reset path. Set the dialog message accordingly.
pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_reset_title));
pd.setMessage(context.getText(
com.android.internal.R.string.reboot_to_reset_message));
pd.setIndeterminate(true);
}
} else if (mReason != null && mReason.equals(PowerManager.SHUTDOWN_USER_REQUESTED)) { } else if (mReason != null && mReason.equals(PowerManager.SHUTDOWN_USER_REQUESTED)) {
Dialog d = new Dialog(context); Dialog d = new Dialog(context);
d.setContentView(com.android.internal.R.layout.shutdown_dialog); d.setContentView(com.android.internal.R.layout.shutdown_dialog);