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

Commit 55b83227 authored by Marzia Favaro's avatar Marzia Favaro Committed by Cherrypicker Worker
Browse files

Require permission to unlock keyguard 

Bug: 288896339
Test: Manual, verify that the app which can be found on the bug can no longer call
keyguardGoingAway successfully


Require permission to unlock keyguard

Bug: 288896339
Test: Manual, verify that the app which can be found on the bug can no longer call
keyguardGoingAway successfully
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bd2aa5d309c5bf8e73161975bd5aba7945b25e84)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ade83209d9d1635bf894b71103e4ac52c51411f4)
Merged-In: I7ba7e56f954c8e6f1f734311f735215918975bc6
Change-Id: I7ba7e56f954c8e6f1f734311f735215918975bc6
parent 32f174ab

core/java/android/app/IActivityTaskManager.aidl

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

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.INTERACT_ACROSS_USERS;

import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
@@ -3472,6 +3473,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 {