Merge "Disable DSU in executeRebootToNormalCommand()" (0b6bf88c) · Commits · e / os / android_frameworks_base

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>

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