summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2022-12-22 21:59:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-22 21:59:09 +0000
commit2c85e87d4ca970a98321369e501a4d3f4452eb43 (patch)
treeec00a4f8d3e61541b2e308f7c230e47c3e973a42
parentb1c502264279c27c7417c4b1ac6baf310ab70f50 (diff)
parent57b3112ebd8420222417839c23328d5ba4a8d73d (diff)
Merge "Switch to "quiet" screenshot success when window destroyed" into tm-qpr-dev am: 9abbc3a37a am: 57b3112ebd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20708875 Change-Id: Ib39c7c04ffdee78a26a983671dca62818bfdcaa7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
index a6447a5bf500..5716a1d7260c 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
@@ -448,6 +448,10 @@ public class ScreenshotController {
// Any cleanup needed when the service is being destroyed.
void onDestroy() {
+ if (mSaveInBgTask != null) {
+ // just log success/failure for the pre-existing screenshot
+ mSaveInBgTask.setActionsReadyListener(this::logSuccessOnActionsReady);
+ }
removeWindow();
releaseMediaPlayer();
releaseContext();