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

Merge "Disable DSU in executeRebootToNormalCommand()" am: 0b6bf88ccd am: f785394fb3 am: b8f884150d am: 7d1a821d9d

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

Change-Id: I795daab4a881b78cc6717cee41bfa01637d93e37
This commit is contained in:
Yo Chiang
2020-10-30 08:20:29 +00:00
committed by Automerger Merge Worker
parent 4ab25f38bc 7d1a821d9d
commit e5a9e4a354
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/DynamicSystemInstallationService/res/values/strings.xml
View File

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

13
packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
View File

@@ -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) {