commit b84d5631104a802e75d68a2d9f42236f37fcd0af
author Miranda Kephart <mkephart@google.com> Mon Nov 08 16:15:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 08 16:15:16 2021 +0000
tree a85b7248b62a888851c14a746863f17374caf5b8
parent 424f2b32b890a40bffea46002122fc0e95b00327
parent 8a9fb9c249270067f7fd30a7bbcea55734afa9de

Merge "Ensure screenshot input monitor is always removed" into sc-v2-dev am: 8a9fb9c249

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16197503

Change-Id: I5ee59b6958f24cb55a7d0a94fb7410b87f0b4b6d

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
index 4d364e1..44b4540 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
@@ -780,6 +780,10 @@
             }
             mWindowManager.removeViewImmediate(decorView);
         }
+        // Ensure that we remove the input monitor
+        if (mScreenshotView != null) {
+            mScreenshotView.stopInputListening();
+        }
     }
 
     /**

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
index a65f98a..ca63ec2 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
@@ -315,7 +315,7 @@
                 });
     }
 
-    private void stopInputListening() {
+    void stopInputListening() {
         if (mInputMonitor != null) {
             mInputMonitor.dispose();
             mInputMonitor = null;