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

Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev am: ca34ab06ec

Browse Source 
am: 3bb6351a4e

* commit '3bb6351a4e258937be3c36d5b239f44312e998c6':
  Use userHandle not credentialOwnerUserId to check if it needs to show lock

Change-Id: Ia8a96ad61a175709e9a2f541a9fcd84be49c0711
This commit is contained in:
Ricky Wai
2016-05-11 17:59:55 +00:00
committed by android-build-merger
parent d3433ac268 3bb6351a4e
commit 81330e75bc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -694,9 +694,8 @@ public class UserManagerService extends IUserManager.Stub {
@Override
public boolean trySetQuietModeDisabled(int userHandle, IntentSender target) {
final int credentialOwnerUserId = getCredentialOwnerProfile(userHandle);
if (StorageManager.isUserKeyUnlocked(userHandle)
|| !mLockPatternUtils.isSecure(credentialOwnerUserId)) {
|| !mLockPatternUtils.isSecure(userHandle)) {
// if the user is already unlocked, no need to show a profile challenge
setQuietModeEnabled(userHandle, false);
return true;