Merge "WM: requestAppKeyboardShortcuts needs REGISTER_WINDOW_MANAGER_LISTENERS" into tm-qpr-dev

2023-03-27 13:55:04 +00:00
parent 0aadb77a13 73106154f0
commit 153e7d1068
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7275,6 +7275,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) {