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

Commit 68ba3e5a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log whenever face or fp enrollment state changes, and when trust... 

Merge "Log whenever face or fp enrollment state changes, and when trust usually managed state changes" into tm-qpr-dev am: dcef8705

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



Change-Id: I952b9304a2184bcd9dff4519fdcbfc0b8ccf4865
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 587a236c dcef8705

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+22 −6
Original line number Diff line number Diff line
@@ -676,7 +676,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    public void onTrustManagedChanged(boolean managed, int userId) {

        Assert.isMainThread();

        mUserTrustIsManaged.put(userId, managed);

        mUserTrustIsUsuallyManaged.put(userId, mTrustManager.isTrustUsuallyManaged(userId));

        boolean trustUsuallyManaged = mTrustManager.isTrustUsuallyManaged(userId);

        mLogger.logTrustUsuallyManagedUpdated(userId, mUserTrustIsUsuallyManaged.get(userId),

                trustUsuallyManaged, "onTrustManagedChanged");

        mUserTrustIsUsuallyManaged.put(userId, trustUsuallyManaged);

        for (int i = 0; i < mCallbacks.size(); i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            if (cb != null) {
@@ -2372,8 +2375,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        updateSecondaryLockscreenRequirement(user);

        List<UserInfo> allUsers = mUserManager.getUsers();

        for (UserInfo userInfo : allUsers) {

            boolean trustUsuallyManaged = mTrustManager.isTrustUsuallyManaged(userInfo.id);

            mLogger.logTrustUsuallyManagedUpdated(userInfo.id,

                    mUserTrustIsUsuallyManaged.get(userInfo.id),

                    trustUsuallyManaged, "init from constructor");

            mUserTrustIsUsuallyManaged.put(userInfo.id,

                    mTrustManager.isTrustUsuallyManaged(userInfo.id));

                    trustUsuallyManaged);

        }

        updateAirplaneModeState();
@@ -2413,10 +2420,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    }



    private void updateFaceEnrolled(int userId) {

        mIsFaceEnrolled = whitelistIpcs(

        Boolean isFaceEnrolled = whitelistIpcs(

                () -> mFaceManager != null && mFaceManager.isHardwareDetected()

                        && mFaceManager.hasEnrolledTemplates(userId)

                        && mBiometricEnabledForUser.get(userId));

        mIsFaceEnrolled = isFaceEnrolled;

        mLogger.logFaceEnrolledUpdated(mIsFaceEnrolled, isFaceEnrolled);

    }



    public boolean isFaceSupported() {
@@ -3071,8 +3080,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    @VisibleForTesting

    boolean isUnlockWithFingerprintPossible(int userId) {

        // TODO (b/242022358), make this rely on onEnrollmentChanged event and update it only once.

        mIsUnlockWithFingerprintPossible.put(userId, mFpm != null && mFpm.isHardwareDetected()

                && !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId));

        boolean fpEnrolled = mFpm != null && mFpm.isHardwareDetected()

                && !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId);

        mLogger.logFpEnrolledUpdated(userId,

                mIsUnlockWithFingerprintPossible.getOrDefault(userId, false),

                fpEnrolled);

        mIsUnlockWithFingerprintPossible.put(userId, fpEnrolled);

        return mIsUnlockWithFingerprintPossible.get(userId);

    }
@@ -3188,7 +3201,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    void handleUserSwitching(int userId, CountDownLatch latch) {

        Assert.isMainThread();

        clearBiometricRecognized();

        mUserTrustIsUsuallyManaged.put(userId, mTrustManager.isTrustUsuallyManaged(userId));

        boolean trustUsuallyManaged = mTrustManager.isTrustUsuallyManaged(userId);

        mLogger.logTrustUsuallyManagedUpdated(userId, mUserTrustIsUsuallyManaged.get(userId),

                trustUsuallyManaged, "userSwitching");

        mUserTrustIsUsuallyManaged.put(userId, trustUsuallyManaged);

        for (int i = 0; i < mCallbacks.size(); i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            if (cb != null) {

packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt

+393 −221

File changed.

Preview size limit exceeded, changes collapsed.