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

Browse Source
This commit is contained in:
Ricky Wai
2016-05-11 17:50:32 +00:00
committed by Android (Google) Code Review
parent c5484969b4 9cc7ad65a1
commit ca34ab06ec
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 @Override
public boolean trySetQuietModeDisabled(int userHandle, IntentSender target) { public boolean trySetQuietModeDisabled(int userHandle, IntentSender target) {
final int credentialOwnerUserId = getCredentialOwnerProfile(userHandle);
if (StorageManager.isUserKeyUnlocked(userHandle) if (StorageManager.isUserKeyUnlocked(userHandle)
|| !mLockPatternUtils.isSecure(credentialOwnerUserId)) { || !mLockPatternUtils.isSecure(userHandle)) {
// if the user is already unlocked, no need to show a profile challenge // if the user is already unlocked, no need to show a profile challenge
setQuietModeEnabled(userHandle, false); setQuietModeEnabled(userHandle, false);
return true; return true;