Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b84d5631 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5ee59b6958f24cb55a7d0a94fb7410b87f0b4b6d
parents 424f2b32 8a9fb9c2

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

+4 −0
Original line number Diff line number Diff line
@@ -780,6 +780,10 @@ public class ScreenshotController { 
            }

            mWindowManager.removeViewImmediate(decorView);

        }

        // Ensure that we remove the input monitor

        if (mScreenshotView != null) {

            mScreenshotView.stopInputListening();

        }

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ public class ScreenshotView extends FrameLayout implements 
                });

    }



    private void stopInputListening() {

    void stopInputListening() {

        if (mInputMonitor != null) {

            mInputMonitor.dispose();

            mInputMonitor = null;