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

Merge "Update intent for requesting parental consent" into sc-dev am: 1798ddbcd6

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

Change-Id: I6c9fd7799a421859bd2a788f40a1ea9793ce311f
This commit is contained in:
Kevin Chyn
2021-06-29 19:03:36 +00:00
committed by Automerger Merge Worker
parent 57eb536327 1798ddbcd6
commit fdb0a36c33
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java
View File

@@ -32,8 +32,10 @@ public class BiometricActionDisabledByAdminController extends BaseActionDisabled
// These MUST not change, as they are the stable API between here and device admin specified
// by the component below.
private static final String ACTION_LEARN_MORE = "android.settings.LEARN_MORE";
private static final String EXTRA_FROM_BIOMETRIC_SETUP = "from_biometric_setup";
private static final String ACTION_LEARN_MORE =
"android.intent.action.MANAGE_RESTRICTED_SETTING";
private static final String EXTRA_SETTING_KEY = "extra_setting";
private static final String EXTRA_SETTING_VALUE = "biometric_disabled_by_admin_controller";
BiometricActionDisabledByAdminController(
DeviceAdminStringProvider stringProvider) {
@@ -63,7 +65,7 @@ public class BiometricActionDisabledByAdminController extends BaseActionDisabled
Log.d(TAG, "Positive button clicked, component: " + enforcedAdmin.component);
final Intent intent = new Intent(ACTION_LEARN_MORE)
.setComponent(enforcedAdmin.component)
.putExtra(EXTRA_FROM_BIOMETRIC_SETUP, true)
.putExtra(EXTRA_SETTING_KEY, EXTRA_SETTING_VALUE)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
};