From ac1a15b69a9d1d03045f4937bc2d628f5aefe62d Mon Sep 17 00:00:00 2001 From: Xiaowen Lei Date: Thu, 3 Mar 2022 02:16:26 +0000 Subject: [PATCH] Fix [AndroidFrameworkRequiresPermission] build warnings for add(remove)KeyguardLockedStateListener. These warnings triggered on ag/16873530. The warnings are like: [AndroidFrameworkRequiresPermission] Method addKeyguardLockedStateListener() annotated {allOf=[android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE]} but too wide; only invokes methods requiring [none] public void addKeyguardLockedStateListener(@NonNull @CallbackExecutor Executor executor, ^ If calling an AIDL interface, it can be annotated by adding: @JavaPassthrough(annotation="@android.annotation.RequiresPermission(...)") Bug: 216630470 Test: n/a Change-Id: I479063de6b591da44c474e4aa93e0466104d2a9a --- core/java/android/view/IWindowManager.aidl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 3f29e3f3078e7..a35a195c50b15 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -201,7 +201,12 @@ interface IWindowManager boolean isKeyguardSecure(int userId); void dismissKeyguard(IKeyguardDismissCallback callback, CharSequence message); + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE)") void addKeyguardLockedStateListener(in IKeyguardLockedStateListener listener); + + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE)") void removeKeyguardLockedStateListener(in IKeyguardLockedStateListener listener); // Requires INTERACT_ACROSS_USERS_FULL permission