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

Merge "Add BiometricActionDisabledByAdminController" into sc-dev

Browse Source
This commit is contained in:
Kevin Chyn
2021-06-17 01:27:03 +00:00
committed by Android (Google) Code Review
parent 3989c51011 4e84b8849a
commit c3e64b14c5
7 changed files with 140 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/biometrics/BiometricAuthenticator.java
View File

@@ -63,6 +63,11 @@ public interface BiometricAuthenticator {
*/
int TYPE_FACE = 1 << 3;
/**
* @hide
*/
int TYPE_ANY_BIOMETRIC = TYPE_FINGERPRINT | TYPE_IRIS | TYPE_FACE;
@IntDef(flag = true, value = {
TYPE_NONE,
TYPE_CREDENTIAL,

19
core/java/android/os/UserManager.java
View File

@@ -1321,6 +1321,24 @@ public class UserManager {
public static final String DISALLOW_CAMERA_TOGGLE =
"disallow_camera_toggle";
/**
* This is really not a user restriction in the normal sense. This can't be set to a user,
* via UserManager nor via DevicePolicyManager. This is not even set in UserSettingsUtils.
* This is defined here purely for convenience within the settings app.
*
* TODO(b/191306258): Refactor the Settings app to remove the need for this field, and delete it
*
* Specifies whether biometrics are available to the user. This is used internally only,
* as a means of communications between biometric settings and
* {@link com.android.settingslib.enterprise.ActionDisabledByAdminControllerFactory}.
*
* @see {@link android.hardware.biometrics.ParentalControlsUtilsInternal}
* @see {@link com.android.settings.biometrics.ParentalControlsUtils}
*
* @hide
*/
public static final String DISALLOW_BIOMETRIC = "disallow_biometric";
/**
* Application restriction key that is used to indicate the pending arrival
* of real restrictions for the app.
@@ -1415,6 +1433,7 @@ public class UserManager {
DISALLOW_MICROPHONE_TOGGLE,
DISALLOW_CAMERA_TOGGLE,
KEY_RESTRICTIONS_PENDING,
DISALLOW_BIOMETRIC,
})
@Retention(RetentionPolicy.SOURCE)
public @interface UserRestrictionKey {}

9
packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminController.java
View File

@@ -18,6 +18,7 @@ package com.android.settingslib.enterprise;
import android.annotation.UserIdInt;
import android.content.Context;
import android.content.DialogInterface;
import androidx.annotation.Nullable;
@@ -54,4 +55,12 @@ public interface ActionDisabledByAdminController {
* Updates the enforced admin
*/
void updateEnforcedAdmin(RestrictedLockUtils.EnforcedAdmin admin, @UserIdInt int adminUserId);
/**
* Returns a listener for handling positive button clicks
*/
@Nullable
default DialogInterface.OnClickListener getPositiveButtonListener() {
return null;
}
}

31
packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java
View File

@@ -20,6 +20,11 @@ import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.ParentalControlsUtilsInternal;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
/**
* A factory that returns the relevant instance of {@link ActionDisabledByAdminController}.
@@ -30,10 +35,28 @@ public final class ActionDisabledByAdminControllerFactory {
* Returns the relevant instance of {@link ActionDisabledByAdminController}.
*/
public static ActionDisabledByAdminController createInstance(Context context,
DeviceAdminStringProvider stringProvider) {
return isFinancedDevice(context)
? new FinancedDeviceActionDisabledByAdminController(stringProvider)
: new ManagedDeviceActionDisabledByAdminController(stringProvider);
String restriction, DeviceAdminStringProvider stringProvider) {
if (doesBiometricRequireParentalConsent(context, restriction)) {
return new BiometricActionDisabledByAdminController(stringProvider);
} else if (isFinancedDevice(context)) {
return new FinancedDeviceActionDisabledByAdminController(stringProvider);
} else {
return new ManagedDeviceActionDisabledByAdminController(stringProvider);
}
}
/**
* @return true if the restriction == UserManager.DISALLOW_BIOMETRIC and parental consent
* is required.
*/
private static boolean doesBiometricRequireParentalConsent(Context context,
String restriction) {
if (!TextUtils.equals(UserManager.DISALLOW_BIOMETRIC, restriction)) {
return false;
}
DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
return ParentalControlsUtilsInternal.parentConsentRequired(context, dpm,
BiometricAuthenticator.TYPE_ANY_BIOMETRIC, new UserHandle(UserHandle.myUserId()));
}
private static boolean isFinancedDevice(Context context) {

57
packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settingslib.enterprise;
import android.content.Context;
import android.content.DialogInterface;
import android.util.Log;
import androidx.annotation.Nullable;
public class BiometricActionDisabledByAdminController extends BaseActionDisabledByAdminController {
private static final String TAG = "BiometricActionDisabledByAdminController";
BiometricActionDisabledByAdminController(
DeviceAdminStringProvider stringProvider) {
super(stringProvider);
}
@Override
public void setupLearnMoreButton(Context context) {
}
@Override
public String getAdminSupportTitle(@Nullable String restriction) {
return mStringProvider.getDisabledBiometricsParentConsentTitle();
}
@Override
public CharSequence getAdminSupportContentString(Context context,
@Nullable CharSequence supportMessage) {
return mStringProvider.getDisabledBiometricsParentConsentContent();
}
@Override
public DialogInterface.OnClickListener getPositiveButtonListener() {
return (dialog, which) -> {
Log.d(TAG, "Positive button clicked");
// TODO(b/188847063) Launch appropriate intent
};
}
}

10
packages/SettingsLib/src/com/android/settingslib/enterprise/DeviceAdminStringProvider.java
View File

@@ -72,4 +72,14 @@ public interface DeviceAdminStringProvider {
* a financed device.
*/
String getDisabledByPolicyTitleForFinancedDevice();
/**
* Returns the dialog title for when biometrics require parental consent.
*/
String getDisabledBiometricsParentConsentTitle();
/**
* Returns the dialog contents for when biometrics require parental consent.
*/
String getDisabledBiometricsParentConsentContent();
}

13
packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/FakeDeviceAdminStringProvider.java
View File

@@ -30,6 +30,8 @@ class FakeDeviceAdminStringProvider implements DeviceAdminStringProvider {
static final String DEFAULT_DISABLED_BY_POLICY_CONTENT = "default_disabled_by_policy_content";
static final String DEFAULT_DISABLED_BY_POLICY_TITLE_FINANCED_DEVICE =
"default_disabled_by_policy_title_financed_device";
static final String DEFAULT_BIOMETRIC_TITLE = "biometric_title";
static final String DEFAULT_BIOMETRIC_CONTENTS = "biometric_contents";
static final DeviceAdminStringProvider DEFAULT_DEVICE_ADMIN_STRING_PROVIDER =
new FakeDeviceAdminStringProvider(/* url = */ null);
@@ -88,4 +90,15 @@ class FakeDeviceAdminStringProvider implements DeviceAdminStringProvider {
public String getDisabledByPolicyTitleForFinancedDevice() {
return DEFAULT_DISABLED_BY_POLICY_TITLE_FINANCED_DEVICE;
}
@Override
public String getDisabledBiometricsParentConsentTitle() {
return DEFAULT_BIOMETRIC_TITLE;
}
@Override
public String getDisabledBiometricsParentConsentContent() {
return DEFAULT_BIOMETRIC_CONTENTS;
}
}