PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inject different User IDs into biometric utils

Browse Source 
Test: atest SettingsUnitTests

Bug: 222217132
Change-Id: I7939d78817f53814d0f8fb4636231a4833fbe26a
This commit is contained in:
Yuri Ufimtsev
2022-03-07 09:20:57 +00:00
parent bdd37ce348
commit f15bebe6c3
13 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics/BiometricNavigationUtils.java
View File

@@ -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

2
src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
View File

@@ -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

2
src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
View File

@@ -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);

6
src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
View File

@@ -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;
}
/**

2
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
View File

@@ -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);

6
src/com/android/settings/biometrics/face/FaceStatusUtils.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.biometrics.face;
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.face.FaceManager;
import android.os.UserHandle;
import com.android.settings.R;
import com.android.settings.Settings;
@@ -32,13 +31,14 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
*/
public class FaceStatusUtils {
private final int mUserId = UserHandle.myUserId();
private final int mUserId;
private final Context mContext;
private final FaceManager mFaceManager;
public FaceStatusUtils(Context context, FaceManager faceManager) {
public FaceStatusUtils(Context context, FaceManager faceManager, int userId) {
mContext = context;
mFaceManager = faceManager;
mUserId = userId;
}
/**

2
src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
View File

@@ -58,7 +58,7 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer
super(context, key);
mFingerprintManager = Utils.getFingerprintManagerOrNull(context);
mFingerprintStatusUtils =
new FingerprintStatusUtils(context, mFingerprintManager);
new FingerprintStatusUtils(context, mFingerprintManager, getUserId());
if (lifecycle != null) {
lifecycle.addObserver(this);

7
src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.biometrics.fingerprint;
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.fingerprint.FingerprintManager;
import android.os.UserHandle;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -31,13 +30,15 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
*/
public class FingerprintStatusUtils {
private final int mUserId = UserHandle.myUserId();
private final int mUserId;
private final Context mContext;
private final FingerprintManager mFingerprintManager;
public FingerprintStatusUtils(Context context, FingerprintManager fingerprintManager) {
public FingerprintStatusUtils(Context context, FingerprintManager fingerprintManager,
int userId) {
mContext = context;
mFingerprintManager = fingerprintManager;
mUserId = userId;
}
/**

12
src/com/android/settings/safetycenter/BiometricsSafetySource.java
View File

@@ -22,6 +22,7 @@ import android.content.Intent;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.os.UserHandle;
import android.safetycenter.SafetyEvent;
import android.safetycenter.SafetySourceData;
import android.safetycenter.SafetySourceStatus;
@@ -47,9 +48,12 @@ public final class BiometricsSafetySource {
return;
}
final BiometricNavigationUtils biometricNavigationUtils = new BiometricNavigationUtils();
final int userId = UserHandle.myUserId();
final BiometricNavigationUtils biometricNavigationUtils = new BiometricNavigationUtils(
userId);
final CombinedBiometricStatusUtils combinedBiometricStatusUtils =
new CombinedBiometricStatusUtils(context);
new CombinedBiometricStatusUtils(context, userId);
if (combinedBiometricStatusUtils.isAvailable()) {
final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
@@ -66,7 +70,7 @@ public final class BiometricsSafetySource {
}
final FaceManager faceManager = Utils.getFaceManagerOrNull(context);
final FaceStatusUtils faceStatusUtils = new FaceStatusUtils(context, faceManager);
final FaceStatusUtils faceStatusUtils = new FaceStatusUtils(context, faceManager, userId);
if (faceStatusUtils.isAvailable()) {
final RestrictedLockUtils.EnforcedAdmin disablingAdmin =
@@ -85,7 +89,7 @@ public final class BiometricsSafetySource {
final FingerprintManager fingerprintManager = Utils.getFingerprintManagerOrNull(context);
final FingerprintStatusUtils fingerprintStatusUtils = new FingerprintStatusUtils(context,
fingerprintManager);
fingerprintManager, userId);
if (fingerprintStatusUtils.isAvailable()) {
final RestrictedLockUtils.EnforcedAdmin disablingAdmin =

2
tests/unit/src/com/android/settings/biometrics/BiometricNavigationUtilsTest.java
View File

@@ -64,7 +64,7 @@ public class BiometricNavigationUtilsTest {
mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
doNothing().when(mContext).startActivity(any());
mBiometricNavigationUtils = new BiometricNavigationUtils();
mBiometricNavigationUtils = new BiometricNavigationUtils(UserHandle.myUserId());
}
@Test

6
tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
View File

@@ -56,7 +56,8 @@ public class CombinedBiometricStatusUtilsTest {
private static final ComponentName COMPONENT_NAME =
new ComponentName("package", "class");
private static final UserHandle USER_HANDLE = new UserHandle(UserHandle.myUserId());
private static final int USER_ID = UserHandle.myUserId();
private static final UserHandle USER_HANDLE = new UserHandle(USER_ID);;
@Mock
@@ -85,7 +86,8 @@ public class CombinedBiometricStatusUtilsTest {
when(mApplicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
when(mApplicationContext.getSystemService(Context.FACE_SERVICE)).thenReturn(mFaceManager);
mCombinedBiometricStatusUtils = new CombinedBiometricStatusUtils(mApplicationContext);
mCombinedBiometricStatusUtils = new CombinedBiometricStatusUtils(
mApplicationContext, USER_ID);
}
@Test

5
tests/unit/src/com/android/settings/biometrics/face/FaceStatusUtilsTest.java
View File

@@ -49,7 +49,8 @@ public class FaceStatusUtilsTest {
private static final ComponentName COMPONENT_NAME =
new ComponentName("package", "class");
private static final UserHandle USER_HANDLE = new UserHandle(UserHandle.myUserId());
private static final int USER_ID = UserHandle.myUserId();
private static final UserHandle USER_HANDLE = new UserHandle(USER_ID);
@Mock
@@ -78,7 +79,7 @@ public class FaceStatusUtilsTest {
when(mApplicationContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
when(mApplicationContext.getSystemService(Context.FACE_SERVICE)).thenReturn(mFaceManager);
mFaceStatusUtils = new FaceStatusUtils(mApplicationContext, mFaceManager);
mFaceStatusUtils = new FaceStatusUtils(mApplicationContext, mFaceManager, USER_ID);
}
@Test

5
tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java
View File

@@ -52,7 +52,8 @@ public class FingerprintStatusUtilsTest {
private static final ComponentName COMPONENT_NAME =
new ComponentName("package", "class");
private static final UserHandle USER_HANDLE = new UserHandle(UserHandle.myUserId());
private static final int USER_ID = UserHandle.myUserId();
private static final UserHandle USER_HANDLE = new UserHandle(USER_ID);
@Mock
@@ -82,7 +83,7 @@ public class FingerprintStatusUtilsTest {
.thenReturn(mDevicePolicyManager);
when(mApplicationContext.getSystemService(Context.FACE_SERVICE)).thenReturn(mFaceManager);
mFingerprintStatusUtils =
new FingerprintStatusUtils(mApplicationContext, mFingerprintManager);
new FingerprintStatusUtils(mApplicationContext, mFingerprintManager, USER_ID);
}
@Test