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

Commit f05c347b authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "TrustManagerService: dump deviceLocked for profiles" into main am:... 

Merge "TrustManagerService: dump deviceLocked for profiles" into main am: 2e9de107 am: 2990fb6b am: 6c626a7f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2852967



Change-Id: Id245b94f56e065b498ab992f2c94bb3c8294c74b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a2ca40a 6c626a7f

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

+16 −2
Original line number Diff line number Diff line
@@ -1598,8 +1598,22 @@ public class TrustManagerService extends SystemService { 
            fout.printf(" User \"%s\" (id=%d, flags=%#x)",

                    user.name, user.id, user.flags);

            if (!user.supportsSwitchToByUser()) {

                fout.println("(managed profile)");

                fout.println("   disabled because switching to this user is not possible.");

                final boolean locked;

                if (user.isProfile()) {

                    if (mLockPatternUtils.isSeparateProfileChallengeEnabled(user.id)) {

                        fout.print(" (profile with separate challenge)");

                        locked = isDeviceLockedInner(user.id);

                    } else {

                        fout.print(" (profile with unified challenge)");

                        locked = isDeviceLockedInner(resolveProfileParent(user.id));

                    }

                } else {

                    fout.println(" (user that cannot be switched to)");

                    locked = isDeviceLockedInner(user.id);

                }

                fout.println(": deviceLocked=" + dumpBool(locked));

                fout.println(

                        "   Trust agents disabled because switching to this user is not possible.");

                return;

            }

            if (isCurrent) {