From 460f84f8c62d69efb67b1ac14444beb81f7c8d47 Mon Sep 17 00:00:00 2001 From: lbill Date: Mon, 29 Aug 2022 22:25:59 +0000 Subject: [PATCH] 1/ Add @TestApi on Settings.Secure.BIOMETRIC_VIRTUAL_ENABLED The e2e BiometricController need to access this field to enabled Fingerprint Virtual HAL. Test: atest sysui-biometrics-jank Test: atest BiometricMicrobenchmark:BiometricPromptMicroBenchmark Bug: 236074209 Change-Id: Iab85a16777b16ac4710521a6ba4bb32737157b2d --- core/api/test-current.txt | 1 + core/api/test-lint-baseline.txt | 4 +++- core/java/android/provider/Settings.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 8836602a3a443..3a9c90752918f 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2214,6 +2214,7 @@ package android.provider { field public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service"; field public static final String ANR_SHOW_BACKGROUND = "anr_show_background"; field public static final String AUTOFILL_SERVICE = "autofill_service"; + field public static final String BIOMETRIC_VIRTUAL_ENABLED = "biometric_virtual_enabled"; field public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled"; field public static final String DISABLED_PRINT_SERVICES = "disabled_print_services"; field @Deprecated public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages"; diff --git a/core/api/test-lint-baseline.txt b/core/api/test-lint-baseline.txt index 0a906bee6fad7..f9b8a30068801 100644 --- a/core/api/test-lint-baseline.txt +++ b/core/api/test-lint-baseline.txt @@ -873,6 +873,8 @@ NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_SHORTCUT_TARG New setting keys are not allowed (Field: ACCESSIBILITY_SHORTCUT_TARGET_SERVICE); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_SERVICE: New setting keys are not allowed (Field: AUTOFILL_SERVICE); use getters/setters in relevant manager class +NoSettingsProvider: android.provider.Settings.Secure#BIOMETRIC_VIRTUAL_ENABLED: + New setting keys are not allowed (Field: BIOMETRIC_VIRTUAL_ENABLED); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#CONTENT_CAPTURE_ENABLED: New setting keys are not allowed (Field: CONTENT_CAPTURE_ENABLED); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#DISABLED_PRINT_SERVICES: @@ -1011,7 +1013,7 @@ UserHandleName: android.content.ContentCaptureOptions: Classes holding a set of parameters should be called `FooParams`, was `ContentCaptureOptions` -VisiblySynchronized: PsiThisExpression:this: +VisiblySynchronized: PsiThisExpression: Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.content.res.AssetManager.getApkPaths() VisiblySynchronized: android.content.res.AssetManager#getApkPaths(): Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.content.res.AssetManager.getApkPaths() diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 14598d558caa4..ce32be95215bf 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9805,6 +9805,7 @@ public final class Settings { * Whether or not virtual sensors are enabled. * @hide */ + @TestApi @Readable public static final String BIOMETRIC_VIRTUAL_ENABLED = "biometric_virtual_enabled";