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

Commit 65f53401 authored by Eric Biggers's avatar Eric Biggers
Browse files

TrustManagerService: dump deviceLocked for profiles 

Make 'dumpsys trust' show the deviceLocked state for users that cannot
be switched to, including profiles.  Previously, the deviceLocked state
was not shown for such users, presumably under the assumption that it
was always the same as the parent user's.  However, profiles that use a
separate challenge do have their own deviceLocked state.

A related issue which this change addresses too is that the output
contained "managed profile" even for other types of profiles.

Bug: 296464083
Test: Tried 'dumpsys trust' in various situations
Flag: exempt, just changes dumpsys
Change-Id: Ibb949626fd4a7a32ebc6daeeff6e9c0192583009
parent 03bf8643

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

+16 −2
Original line number Diff line number Diff line
@@ -1647,8 +1647,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) {