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

Commit 7bc2322a authored by Marzia Favaro's avatar Marzia Favaro Committed by Automerger Merge Worker
Browse files

Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033... 

Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033 am: 4397e741 am: 89a3862e am: 8aaad2a2 am: c4e7a608 am: fa1f3f3c am: ff53f5a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230



Change-Id: Ibdff8018517b1d9c3944b2475e7d675c0cfca72f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77bc47cc ff53f5a2

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

+2 −0
Original line number Original line 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.BIND_VOICE_INTERACTION;

import static android.Manifest.permission.CHANGE_CONFIGURATION;

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

import static android.Manifest.permission.DETECT_SCREEN_CAPTURE;

import static android.Manifest.permission.DETECT_SCREEN_CAPTURE;

import static android.Manifest.permission.INTERACT_ACROSS_USERS;

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




    @Override

    @Override

    public void keyguardGoingAway(int flags) {

    public void keyguardGoingAway(int flags) {

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

        enforceNotIsolatedCaller("keyguardGoingAway");

        enforceNotIsolatedCaller("keyguardGoingAway");

        final long token = Binder.clearCallingIdentity();

        final long token = Binder.clearCallingIdentity();

        try {

        try {