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

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev

Browse Source 
am: f40f297546

Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
This commit is contained in:
Tianjie Xu
2017-06-13 00:58:53 +00:00
committed by android-build-merger
parent aec6b4749a f40f297546
commit c7fed42403
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,7 @@ public final class ShutdownThread extends Thread {
ProgressDialog pd = new ProgressDialog(context); ProgressDialog pd = new ProgressDialog(context);
// Path 1: Reboot to recovery for update // Path 1: Reboot to recovery for update
// Condition: mReason == REBOOT_RECOVERY_UPDATE // Condition: mReason startswith REBOOT_RECOVERY_UPDATE
// //
// Path 1a: uncrypt needed // Path 1a: uncrypt needed
// Condition: if /cache/recovery/uncrypt_file exists but // Condition: if /cache/recovery/uncrypt_file exists but
@@ -276,7 +276,9 @@ public final class ShutdownThread extends Thread {
// Path 3: Regular reboot / shutdown // Path 3: Regular reboot / shutdown
// Condition: Otherwise // Condition: Otherwise
// UI: spinning circle only (no progress bar) // UI: spinning circle only (no progress bar)
if (PowerManager.REBOOT_RECOVERY_UPDATE.equals(mReason)) {
// mReason could be "recovery-update" or "recovery-update,quiescent".
if (mReason != null && mReason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) {
// We need the progress bar if uncrypt will be invoked during the // We need the progress bar if uncrypt will be invoked during the
// reboot, which might be time-consuming. // reboot, which might be time-consuming.
mRebootHasProgressBar = RecoverySystem.UNCRYPT_PACKAGE_FILE.exists() mRebootHasProgressBar = RecoverySystem.UNCRYPT_PACKAGE_FILE.exists()
@@ -295,7 +297,7 @@ public final class ShutdownThread extends Thread {
pd.setMessage(context.getText( pd.setMessage(context.getText(
com.android.internal.R.string.reboot_to_update_reboot)); com.android.internal.R.string.reboot_to_update_reboot));
} }
} else if (PowerManager.REBOOT_RECOVERY.equals(mReason)) { } else if (mReason != null && mReason.equals(PowerManager.REBOOT_RECOVERY)) {
// Factory reset path. Set the dialog message accordingly. // Factory reset path. Set the dialog message accordingly.
pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_reset_title)); pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_reset_title));
pd.setMessage(context.getText( pd.setMessage(context.getText(

2
services/java/com/android/server/SystemServer.java
View File

@@ -454,7 +454,7 @@ public final class SystemServer {
// If '/cache/recovery/block.map' hasn't been created, stop the // If '/cache/recovery/block.map' hasn't been created, stop the
// reboot which will fail for sure, and get a chance to capture a // reboot which will fail for sure, and get a chance to capture a
// bugreport when that's still feasible. (Bug: 26444951) // bugreport when that's still feasible. (Bug: 26444951)
if (PowerManager.REBOOT_RECOVERY_UPDATE.equals(reason)) { if (reason != null && reason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) {
File packageFile = new File(UNCRYPT_PACKAGE_FILE); File packageFile = new File(UNCRYPT_PACKAGE_FILE);
if (packageFile.exists()) { if (packageFile.exists()) {
String filename = null; String filename = null;