Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d76220ed authored by Marzia Favaro's avatar Marzia Favaro Committed by Android (Google) Code Review
Browse files

Merge "Require permission to unlock keyguard" into main

parents 73435cd3 bd2aa5d3

core/java/android/app/IActivityTaskManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,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);

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.Manifest.permission.BIND_VOICE_INTERACTION;

import static android.Manifest.permission.CHANGE_CONFIGURATION;

import static android.Manifest.permission.CONTROL_KEYGUARD;

import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS;

import static android.Manifest.permission.DETECT_SCREEN_CAPTURE;

import static android.Manifest.permission.INTERACT_ACROSS_USERS;
@@ -3549,6 +3550,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


    @Override

    public void keyguardGoingAway(int flags) {

        mAmInternal.enforceCallingPermission(CONTROL_KEYGUARD, "unlock keyguard");

        enforceNotIsolatedCaller("keyguardGoingAway");

        final long token = Binder.clearCallingIdentity();

        try {