Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5ee59b6958f24cb55a7d0a94fb7410b87f0b4b6d
This commit is contained in:
Miranda Kephart
2021-11-08 16:15:16 +00:00
committed by Automerger Merge Worker
parent 424f2b32b8 8a9fb9c249
commit b84d563110
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
View File

@@ -780,6 +780,10 @@ public class ScreenshotController {
} }
mWindowManager.removeViewImmediate(decorView); mWindowManager.removeViewImmediate(decorView);
} }
// Ensure that we remove the input monitor
if (mScreenshotView != null) {
mScreenshotView.stopInputListening();
}
} }
/** /**

2
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
View File

@@ -315,7 +315,7 @@ public class ScreenshotView extends FrameLayout implements
}); });
} }
private void stopInputListening() { void stopInputListening() {
if (mInputMonitor != null) { if (mInputMonitor != null) {
mInputMonitor.dispose(); mInputMonitor.dispose();
mInputMonitor = null; mInputMonitor = null;