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

Commit 1fa1f100 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode"... 

Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f2975 am: d04d501c" into oc-dr1-dev-plus-aosp
parents e1f07567 40b3f293

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

+5 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public final class ShutdownThread extends Thread { 
        ProgressDialog pd = new ProgressDialog(context);



        // Path 1: Reboot to recovery for update

        //   Condition: mReason == REBOOT_RECOVERY_UPDATE

        //   Condition: mReason startswith REBOOT_RECOVERY_UPDATE

        //

        //  Path 1a: uncrypt needed

        //   Condition: if /cache/recovery/uncrypt_file exists but
@@ -276,7 +276,9 @@ public final class ShutdownThread extends Thread { 
        // Path 3: Regular reboot / shutdown

        //   Condition: Otherwise

        //   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

            // reboot, which might be time-consuming.

            mRebootHasProgressBar = RecoverySystem.UNCRYPT_PACKAGE_FILE.exists()
@@ -295,7 +297,7 @@ public final class ShutdownThread extends Thread { 
                pd.setMessage(context.getText(

                            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.

            pd.setTitle(context.getText(com.android.internal.R.string.reboot_to_reset_title));

            pd.setMessage(context.getText(

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ public final class SystemServer { 
            // If '/cache/recovery/block.map' hasn't been created, stop the

            // reboot which will fail for sure, and get a chance to capture a

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

                if (packageFile.exists()) {

                    String filename = null;