commit aac427df4ce8fc4e153fb29cfd0b43a0e149c62f
author Marzia Favaro <marziana@google.com> Mon Sep 18 16:59:00 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 18 16:59:00 2023 +0000
tree 5ab439f822f32dde2fb2955987298fa8844f97b9
parent f72e484da4888a0094729d4bdb508124b92eca5f
parent 712ec1f4f8d08049e0e4b1cc1736cc900eacb0d6

Merge "Require permission to unlock keyguard" into sc-qpr1-dev

core/java/android/app/IActivityTaskManager.aidl

diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index 74d51a0..fa3a5d5 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -245,6 +245,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);