commit bc9059ae54a38bcc39887e29421863f7badd0dfc
author Marzia Favaro <marziana@google.com> Wed Sep 20 08:26:49 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 20 08:26:49 2023 +0000
tree 7df92e7c7bcdf3231f397102f37b2d8aa06bf797
parent 1e4cc975ff0ee6f7dabc04e94cd9205076e79428
parent 55b8322714f876cc1d36d5774c1c1f0c1101581b

Merge "Require permission to unlock keyguard" into tm-qpr-dev

core/java/android/app/IActivityTaskManager.aidl

diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index 52732d3..d7367f9 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -241,6 +241,7 @@
      *              {@link android.view.WindowManagerPolicyConstants#KEYGUARD_GOING_AWAY_FLAG_TO_SHADE}
      *              etc.
      */
+     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.CONTROL_KEYGUARD)")
     void keyguardGoingAway(int flags);
 
     void suppressResizeConfigChanges(boolean suppress);