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

Commit ace3e112 authored by Chandru S's avatar Chandru S
Browse files

Log whenever face or fp enrollment state changes, and when trust usually managed state changes

Bug: 267336592
Test: NA
Change-Id: I4db4a3bda7d86c56afbb79200f333d03b6075ba2
parent 121819ee
Loading
Loading
Loading
Loading
+22 −6
Original line number Diff line number Diff line
@@ -683,7 +683,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) {
@@ -2338,8 +2341,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();

@@ -2379,9 +2386,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
    }

    private void updateFaceEnrolled(int userId) {
        mIsFaceEnrolled = mFaceManager != null && !mFaceSensorProperties.isEmpty()
        Boolean isFaceEnrolled = mFaceManager != null && !mFaceSensorProperties.isEmpty()
                && mBiometricEnabledForUser.get(userId)
                && mAuthController.isFaceAuthEnrolled(userId);
        mIsFaceEnrolled = isFaceEnrolled;
        mLogger.logFaceEnrolledUpdated(mIsFaceEnrolled, isFaceEnrolled);
    }

    public boolean isFaceSupported() {
@@ -3037,9 +3046,13 @@ 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
        boolean fpEnrolled = mFpm != null
                && !mFingerprintSensorProperties.isEmpty()
                && !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId));
                && !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId);
        mLogger.logFpEnrolledUpdated(userId,
                mIsUnlockWithFingerprintPossible.getOrDefault(userId, false),
                fpEnrolled);
        mIsUnlockWithFingerprintPossible.put(userId, fpEnrolled);
        return mIsUnlockWithFingerprintPossible.get(userId);
    }

@@ -3155,7 +3168,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
    void handleUserSwitching(int userId, IRemoteCallback reply) {
        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) {
+393 −221

File changed.

Preview size limit exceeded, changes collapsed.