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 
am: ca34ab06ec

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

Change-Id: I0015c35a2f4b024c22f9bf2e2d43dc6ca25db046
This commit is contained in:
Ricky Wai
2016-05-11 17:56:35 +00:00
committed by android-build-merger
parent 9ded33a4c7 ca34ab06ec
commit 3bb6351a4e
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;