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

Commit f15bebe6 authored by Yuri Ufimtsev's avatar Yuri Ufimtsev
Browse files

Inject different User IDs into biometric utils 

Test: atest SettingsUnitTests

Bug: 222217132
Change-Id: I7939d78817f53814d0f8fb4636231a4833fbe26a
parent bdd37ce3

src/com/android/settings/biometrics/BiometricNavigationUtils.java

+5 −1
Original line number Diff line number Diff line
@@ -37,7 +37,11 @@ import com.android.settingslib.transition.SettingsTransitionHelper; 
 */

public class BiometricNavigationUtils {



    private final int mUserId = UserHandle.myUserId();

    private final int mUserId;



    public BiometricNavigationUtils(int userId) {

        mUserId = userId;

    }



    /**

     * Tries to launch the Settings screen if Quiet Mode is not enabled

src/com/android/settings/biometrics/BiometricStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public abstract class BiometricStatusPreferenceController extends BasePreference 
                .getSecurityFeatureProvider()

                .getLockPatternUtils(context);

        mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId);

        mBiometricNavigationUtils = new BiometricNavigationUtils();

        mBiometricNavigationUtils = new BiometricNavigationUtils(getUserId());

    }



    @Override

src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class CombinedBiometricStatusPreferenceController extends 
    public CombinedBiometricStatusPreferenceController(

            Context context, String key, Lifecycle lifecycle) {

        super(context, key);

        mCombinedBiometricStatusUtils = new CombinedBiometricStatusUtils(context);

        mCombinedBiometricStatusUtils = new CombinedBiometricStatusUtils(context, getUserId());



        if (lifecycle != null) {

            lifecycle.addObserver(this);

src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.UserHandle;



import androidx.annotation.Nullable;
@@ -35,17 +34,18 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; 
 */

public class CombinedBiometricStatusUtils {



    private final int mUserId = UserHandle.myUserId();

    private final int mUserId;

    private final Context mContext;

    @Nullable

    FingerprintManager mFingerprintManager;

    @Nullable

    FaceManager mFaceManager;



    public CombinedBiometricStatusUtils(Context context) {

    public CombinedBiometricStatusUtils(Context context, int userId) {

        mContext = context;

        mFingerprintManager = Utils.getFingerprintManagerOrNull(context);

        mFaceManager = Utils.getFaceManagerOrNull(context);

        mUserId = userId;

    }



    /**

src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon 
    public FaceStatusPreferenceController(Context context, String key, Lifecycle lifecycle) {

        super(context, key);

        mFaceManager = Utils.getFaceManagerOrNull(context);

        mFaceStatusUtils = new FaceStatusUtils(context, mFaceManager);

        mFaceStatusUtils = new FaceStatusUtils(context, mFaceManager, getUserId());



        if (lifecycle != null) {

            lifecycle.addObserver(this);