summaryrefslogtreecommitdiff
path: root/packages/DynamicSystemInstallationService
diff options
context:
space:
mode:
authorYo Chiang <yochiang@google.com>2020-10-06 04:38:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-06 04:38:53 +0000
commit7af64dd1f73e05c5ad9ad52a13fc171a81a87cab (patch)
tree0e6cb01eb9c8ae46c040c21187091aed6923f02e /packages/DynamicSystemInstallationService
parent2cae888d177eecf64b499f71f0be2ec2ccbc1808 (diff)
parent33130380175d69480c89049c3d2eab2fc01930e2 (diff)
Merge "Dismiss DSU notification in executeDiscardCommand()" am: 3313038017
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448418 Change-Id: Id0a2b1fb7752e3d9de83f3613d0290c0ecf9096a
Diffstat (limited to 'packages/DynamicSystemInstallationService')
-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;
}