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

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

Merge "Remove TrustManagerService#mUserIsTrusted" into main am: ac4fd527 am:... 

Merge "Remove TrustManagerService#mUserIsTrusted" into main am: ac4fd527 am: f6b496b9 am: 58d02fa4

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



Change-Id: Ic978e75166381ef4924d0fb4db58956185b4c7e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a36cf269 58d02fa4

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

+0 −6
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ public class TrustManagerService extends SystemService { 
    private final ActivityManager mActivityManager;

    private VirtualDeviceManagerInternal mVirtualDeviceManager;



    @GuardedBy("mUserIsTrusted")

    private final SparseBooleanArray mUserIsTrusted = new SparseBooleanArray();



    private enum TrustState {

        UNTRUSTED, // the phone is not unlocked by any trustagents

        TRUSTABLE, // the phone is in a semi-locked state that can be unlocked if
@@ -2041,9 +2038,6 @@ public class TrustManagerService extends SystemService { 
            } else if (Intent.ACTION_USER_REMOVED.equals(action)) {

                int userId = getUserId(intent);

                if (userId > 0) {

                    synchronized (mUserIsTrusted) {

                        mUserIsTrusted.delete(userId);

                    }

                    synchronized (mDeviceLockedForUser) {

                        mDeviceLockedForUser.delete(userId);

                    }