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

Commit 1c0cfcca authored by Wenhui Yang's avatar Wenhui Yang
Browse files

Fix NPE caused by [4/n] FRR data cleanup 

Fixes: 296291580
Test: AuthenticationStatsPersisterTest
Change-Id: I8e767746b7eea86c0a1e3725ef8a356b1c3189c9
parent c6f6667b

services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java

+5 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ public class AuthenticationStatsCollector { 


    @NonNull private final Map<Integer, AuthenticationStats> mUserAuthenticationStatsMap;



    @NonNull private AuthenticationStatsPersister mAuthenticationStatsPersister;

    // TODO(b/295582896): Find a way to make this NonNull

    @Nullable private AuthenticationStatsPersister mAuthenticationStatsPersister;

    @NonNull private BiometricNotification mBiometricNotification;



    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@@ -164,6 +165,9 @@ public class AuthenticationStatsCollector { 
    }



    private void onUserRemoved(final int userId) {

        if (mAuthenticationStatsPersister == null) {

            initializeUserAuthenticationStatsMap();

        }

        mUserAuthenticationStatsMap.remove(userId);

        mAuthenticationStatsPersister.removeFrrStats(userId);

    }