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

Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev

Browse Source
This commit is contained in:
Kevin Chyn
2021-06-16 07:55:01 +00:00
committed by Android (Google) Code Review
parent fce6e1772a add8de49e9
commit 826df7ae78
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/biometrics/ParentalControlsUtils.java
View File

@@ -21,9 +21,7 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.ParentalControlsUtilsInternal; import android.hardware.biometrics.ParentalControlsUtilsInternal;
import android.os.Build;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log; import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -39,24 +37,19 @@ import com.android.settingslib.RestrictedLockUtils;
public class ParentalControlsUtils { public class ParentalControlsUtils {
private static final String TAG = "ParentalControlsUtils"; private static final String TAG = "ParentalControlsUtils";
private static final String TEST_ALWAYS_REQUIRE_CONSENT =
"com.android.settings.biometrics.ParentalControlsUtils.always_require_consent";
/** /**
* Public version that enables test paths based on {@link #TEST_ALWAYS_REQUIRE_CONSENT} * Public version that enables test paths, see
* {@link android.hardware.biometrics.ParentalControlsUtilsInternal#isTestModeEnabled(Context)}
* @return non-null EnforcedAdmin if parental consent is required * @return non-null EnforcedAdmin if parental consent is required
*/ */
public static RestrictedLockUtils.EnforcedAdmin parentConsentRequired(@NonNull Context context, public static RestrictedLockUtils.EnforcedAdmin parentConsentRequired(@NonNull Context context,
@BiometricAuthenticator.Modality int modality) { @BiometricAuthenticator.Modality int modality) {
final UserHandle userHandle = new UserHandle(UserHandle.myUserId()); final UserHandle userHandle = new UserHandle(UserHandle.myUserId());
if (Build.IS_USERDEBUG || Build.IS_ENG) { if (ParentalControlsUtilsInternal.isTestModeEnabled(context)) {
final boolean testAlwaysRequireConsent = Settings.Secure.getInt( Log.d(TAG, "Requiring consent for test flow");
context.getContentResolver(), TEST_ALWAYS_REQUIRE_CONSENT, 0) != 0; return new RestrictedLockUtils.EnforcedAdmin(null /* ComponentName */, userHandle);
if (testAlwaysRequireConsent) {
Log.d(TAG, "Requiring consent for test flow");
return new RestrictedLockUtils.EnforcedAdmin(null /* ComponentName */, userHandle);
}
} }
final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class); final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
@@ -72,7 +65,8 @@ public class ParentalControlsUtils {
static RestrictedLockUtils.EnforcedAdmin parentConsentRequiredInternal( static RestrictedLockUtils.EnforcedAdmin parentConsentRequiredInternal(
@NonNull DevicePolicyManager dpm, @BiometricAuthenticator.Modality int modality, @NonNull DevicePolicyManager dpm, @BiometricAuthenticator.Modality int modality,
@NonNull UserHandle userHandle) { @NonNull UserHandle userHandle) {
if (ParentalControlsUtilsInternal.parentConsentRequired(dpm, modality, userHandle)) { if (ParentalControlsUtilsInternal.parentConsentRequired(dpm, modality,
userHandle)) {
final ComponentName cn = final ComponentName cn =
ParentalControlsUtilsInternal.getSupervisionComponentName(dpm, userHandle); ParentalControlsUtilsInternal.getSupervisionComponentName(dpm, userHandle);
return new RestrictedLockUtils.EnforcedAdmin(cn, userHandle); return new RestrictedLockUtils.EnforcedAdmin(cn, userHandle);