summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-20 08:26:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-09-20 08:26:49 +0000
commitbc9059ae54a38bcc39887e29421863f7badd0dfc (patch)
tree7df92e7c7bcdf3231f397102f37b2d8aa06bf797
parent1e4cc975ff0ee6f7dabc04e94cd9205076e79428 (diff)
parent55b8322714f876cc1d36d5774c1c1f0c1101581b (diff)
Merge "Require permission to unlock keyguard" into tm-qpr-dev
-rw-r--r--core/java/android/app/IActivityTaskManager.aidl1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index 52732d3eba78..d7367f900205 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -241,6 +241,7 @@ interface IActivityTaskManager {
* {@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);