Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Provide a valid ComponentName for testing Parental Controls" into tm-dev am: b27e211943

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522126

Change-Id: Ifd2bd34db3baec6ba194990086bab81770dc731c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yuri Ufimtsev
2022-04-04 10:53:53 +00:00
committed by Automerger Merge Worker
parent 95f3688e36 b27e211943
commit fd79cd39cb
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/hardware/biometrics/ParentalControlsUtilsInternal.java
View File

@@ -32,21 +32,33 @@ import android.provider.Settings;
*/
public class ParentalControlsUtilsInternal {
private static final String TEST_ALWAYS_REQUIRE_CONSENT =
"android.hardware.biometrics.ParentalControlsUtilsInternal.always_require_consent";
private static final String TEST_ALWAYS_REQUIRE_CONSENT_PACKAGE =
"android.hardware.biometrics.ParentalControlsUtilsInternal.require_consent_package";
private static final String TEST_ALWAYS_REQUIRE_CONSENT_CLASS =
"android.hardware.biometrics.ParentalControlsUtilsInternal.require_consent_class";
public static boolean isTestModeEnabled(@NonNull Context context) {
/**
* ComponentName of Parent Consent activity for testing Biometric authentication disabled by
* Parental Controls.
*
* <p>Component could be defined by values of {@link #TEST_ALWAYS_REQUIRE_CONSENT_PACKAGE} and
* {@link #TEST_ALWAYS_REQUIRE_CONSENT_CLASS} Secure settings.
*/
public static ComponentName getTestComponentName(@NonNull Context context, int userId) {
if (Build.IS_USERDEBUG || Build.IS_ENG) {
return Settings.Secure.getInt(context.getContentResolver(),
TEST_ALWAYS_REQUIRE_CONSENT, 0) != 0;
final String pkg = Settings.Secure.getStringForUser(context.getContentResolver(),
TEST_ALWAYS_REQUIRE_CONSENT_PACKAGE, userId);
final String cls = Settings.Secure.getStringForUser(context.getContentResolver(),
TEST_ALWAYS_REQUIRE_CONSENT_CLASS, userId);
return pkg != null && cls != null ? new ComponentName(pkg, cls) : null;
}
return false;
return null;
}
public static boolean parentConsentRequired(@NonNull Context context,
@NonNull DevicePolicyManager dpm, @BiometricAuthenticator.Modality int modality,
@NonNull UserHandle userHandle) {
if (isTestModeEnabled(context)) {
if (getTestComponentName(context, userHandle.getIdentifier()) != null) {
return true;
}