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

Commit 94cad9bd authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

Merge "Work profile without password shouldn't be locked." into pi-dev am: 614e26db 

am: 367d5f5c

Change-Id: Iba8192b2bb43d430e28316e57c4673e8ee3d79c2
parents 97ac6996 367d5f5c

services/core/java/com/android/server/trust/TrustManagerService.java

+11 −5
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.provider.Settings;

import android.service.trust.TrustAgentService;

import android.text.TextUtils;
@@ -61,7 +60,6 @@ import android.view.IWindowManager; 
import android.view.WindowManagerGlobal;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.content.PackageMonitor;

import com.android.internal.policy.IKeyguardDismissCallback;

import com.android.internal.util.DumpUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.server.SystemService;
@@ -432,13 +430,20 @@ public class TrustManagerService extends SystemService { 
        for (int i = 0; i < userInfos.size(); i++) {

            UserInfo info = userInfos.get(i);



            if (info == null || info.partial || !info.isEnabled() || info.guestToRemove

                    || !info.supportsSwitchToByUser()) {

            if (info == null || info.partial || !info.isEnabled() || info.guestToRemove) {

                continue;

            }



            int id = info.id;

            boolean secure = mLockPatternUtils.isSecure(id);



            if (!info.supportsSwitchToByUser()) {

                if (info.isManagedProfile() && !secure) {

                    setDeviceLockedForUser(id, false);

                }

                continue;

            }



            boolean trusted = aggregateIsTrusted(id);

            boolean showingKeyguard = true;

            boolean biometricAuthenticated = false;
@@ -993,7 +998,8 @@ public class TrustManagerService extends SystemService { 
            enforceReportPermission();

            final long identity = Binder.clearCallingIdentity();

            try {

                if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {

                if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)

                        && mLockPatternUtils.isSecure(userId)) {

                    synchronized (mDeviceLockedForUser) {

                        mDeviceLockedForUser.put(userId, locked);

                    }