Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow current profiles to disable keyguard"

Browse Source
This commit is contained in:
Tony Mak
2017-01-06 12:06:29 +00:00
committed by Android (Google) Code Review
parent 55ab172acf 555a59ad27
commit aedb707aa3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -3850,9 +3850,9 @@ public class WindowManagerService extends IWindowManager.Stub
return;
}
// If this isn't coming from the current user, ignore it.
if (Binder.getCallingUserHandle().getIdentifier() != mCurrentUserId) {
Log.d(TAG_WM, "non-current user, ignore disableKeyguard");
// If this isn't coming from the current profiles, ignore it.
if (!isCurrentProfileLocked(UserHandle.getCallingUserId())) {
Log.d(TAG_WM, "non-current profiles, ignore disableKeyguard");
return;
}