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

Commit 0a3ffdcb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not wake from stylus buttons when disabled" into udc-dev am: 7491657c 

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



Change-Id: I893b98dab4cde87e6165fcf1a4c9803ef3340952
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d83a322 7491657c

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −0
Original line number Diff line number Diff line
@@ -4576,6 +4576,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


            case KeyEvent.KEYCODE_BACK:

                return mWakeOnBackKeyPress;



            case KeyEvent.KEYCODE_STYLUS_BUTTON_PRIMARY:

            case KeyEvent.KEYCODE_STYLUS_BUTTON_SECONDARY:

            case KeyEvent.KEYCODE_STYLUS_BUTTON_TERTIARY:

            case KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL:

                return mStylusButtonsEnabled;

        }



        return true;