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

Commit 20705c6e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix the CWE problem in Biometrics." into main am: eb541f11 

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



Change-Id: I6a46b399e02250e5bae7f4f8b412c526dd244517
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0ba9680 eb541f11

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

+6 −5
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ import java.util.Map; 
import java.util.Random;

import java.util.Set;

import java.util.concurrent.atomic.AtomicLong;

import java.util.concurrent.CopyOnWriteArrayList;

import java.util.function.Supplier;



/**
@@ -132,7 +133,7 @@ public class BiometricService extends SystemService { 
    IGateKeeperService mGateKeeper;



    // Get and cache the available biometric authenticators and their associated info.

    final ArrayList<BiometricSensor> mSensors = new ArrayList<>();

    final CopyOnWriteArrayList<BiometricSensor> mSensors = new CopyOnWriteArrayList<>();



    @VisibleForTesting

    BiometricStrengthController mBiometricStrengthController;
@@ -156,13 +157,13 @@ public class BiometricService extends SystemService { 
        @NonNull private final Set<Integer> mSensorsPendingInvalidation;



        public static InvalidationTracker start(@NonNull Context context,

                @NonNull ArrayList<BiometricSensor> sensors,

                int userId, int fromSensorId, @NonNull IInvalidationCallback clientCallback) {

                @NonNull List<BiometricSensor> sensors, int userId,

                int fromSensorId, @NonNull IInvalidationCallback clientCallback) {

            return new InvalidationTracker(context, sensors, userId, fromSensorId, clientCallback);

        }



        private InvalidationTracker(@NonNull Context context,

                @NonNull ArrayList<BiometricSensor> sensors, int userId,

                @NonNull List<BiometricSensor> sensors, int userId,

                int fromSensorId, @NonNull IInvalidationCallback clientCallback) {

            mClientCallback = clientCallback;

            mSensorsPendingInvalidation = new ArraySet<>();
@@ -844,7 +845,7 @@ public class BiometricService extends SystemService { 


        @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)

        @Override

        public synchronized void registerAuthenticator(int id, int modality,

        public void registerAuthenticator(int id, int modality,

                @Authenticators.Types int strength,

                @NonNull IBiometricAuthenticator authenticator) {