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

Commit f24580fd 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

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



Change-Id: I309988193167de7d8fdd0992ba6e585b969dd9e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa945174 153e7d10

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

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




    @Override

    @Override

    public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId) {

    public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId) {

        mContext.enforceCallingOrSelfPermission(REGISTER_WINDOW_MANAGER_LISTENERS,

                "requestAppKeyboardShortcuts");



        try {

        try {

            WindowState focusedWindow = getFocusedWindow();

            WindowState focusedWindow = getFocusedWindow();

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

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