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 am: 1933de0f3e

Browse Source 
am: 78daf065b4

* commit '78daf065b4c7a7ee9312a5660aaccd6fd5bdfe22':
  Use userHandle not credentialOwnerUserId to check if it needs to show lock

Change-Id: I6f373753156f3f9d1ec0fe13af35c1e6e6af2246
This commit is contained in:
Ricky Wai
2016-05-11 18:02:57 +00:00
committed by android-build-merger
parent 6e278deb0e 78daf065b4
commit be5ba92401
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;