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

Commit 6cdafdb7 authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge "WM: requestAppKeyboardShortcuts needs... 

Merge "WM: requestAppKeyboardShortcuts needs REGISTER_WINDOW_MANAGER_LISTENERS" into tm-qpr-dev am: 153e7d10 am: f24580fd

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



Change-Id: I6237e78170625efaa38494b5cbca9c01e5ff40e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08fdc875 f24580fd

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -7088,6 +7088,9 @@ public class WindowManagerService extends IWindowManager.Stub 


    @Override

    public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId) {

        mContext.enforceCallingOrSelfPermission(REGISTER_WINDOW_MANAGER_LISTENERS,

                "requestAppKeyboardShortcuts");



        try {

            WindowState focusedWindow = getFocusedWindow();

            if (focusedWindow != null && focusedWindow.mClient != null) {