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

Commit b8f88415 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Disable DSU in executeRebootToNormalCommand()" am: 0b6bf88c am: f785394f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470783

Change-Id: Ie3cccfbeb1d4d187bcf2282fe0fcdbcbc22ca261
parents af8cf941 f785394f

packages/DynamicSystemInstallationService/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
    <string name="toast_dynsystem_discarded">Discarded dynamic system</string>

    <!-- Toast when we fail to launch into Dynamic System [CHAR LIMIT=128] -->

    <string name="toast_failed_to_reboot_to_dynsystem">Can\u2019t restart or load dynamic system</string>

    <!-- Toast when we fail to disable Dynamic System [CHAR LIMIT=128] -->

    <string name="toast_failed_to_disable_dynsystem">Failed to disable dynamic system</string>





    <!-- URL of Dynamic System Key Revocation List [DO NOT TRANSLATE] -->

    <string name="key_revocation_list_url" translatable="false">https://dl.google.com/developers/android/gsi/gsi-keyblacklist.json</string>

packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java

+11 −2
Original line number Diff line number Diff line
@@ -375,8 +375,17 @@ public class DynamicSystemInstallationService extends Service 
            return;

        }



        // Per current design, we don't have disable() API. AOT is disabled on next reboot.

        // TODO: Use better status query when b/125079548 is done.

        if (!mDynSystem.setEnable(/* enable = */ false, /* oneShot = */ false)) {

            Log.e(TAG, "Failed to disable DynamicSystem.");



            // Dismiss status bar and show a toast.

            sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));

            Toast.makeText(this,

                    getString(R.string.toast_failed_to_disable_dynsystem),

                    Toast.LENGTH_LONG).show();

            return;

        }



        PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);



        if (powerManager != null) {