summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYo Chiang <yochiang@google.com>2020-10-06 05:34:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-06 05:34:47 +0000
commit970bd09428d92e18dfd36a9c55b97eb23eb70fd6 (patch)
tree6d9372f9fc2db010c16c709f3f8467f7bfa23c11
parent9dafdcee23bfa258658237999a95e30591392fdb (diff)
parent9e4764431474f90f9207afdacf6681f9a827d7c4 (diff)
Merge "Dismiss DSU notification in executeDiscardCommand()" am: 3313038017 am: 7af64dd1f7 am: 9e47644314
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448418 Change-Id: I594969a53e55a148ce6277dae47e9b1e4f888b6b
-rw-r--r--packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
index 9ff868467531..f7f3cbb7d332 100644
--- a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
+++ b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
@@ -321,6 +321,9 @@ public class DynamicSystemInstallationService extends Service
if (!isDynamicSystemInstalled() && (getStatus() != STATUS_READY)) {
Log.e(TAG, "Trying to discard AOT while there is no complete installation");
+ // Stop foreground state and dismiss stale notification.
+ stopForeground(STOP_FOREGROUND_REMOVE);
+ resetTaskAndStop();
return;
}