Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78daf065 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Use userHandle not credentialOwnerUserId to check if it needs to show... 

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

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

Change-Id: I4bef71e2effb7fd11f9ea5973aeb218fcf5dabba
parents d3433ac2 1933de0f

services/core/java/com/android/server/pm/UserManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -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;