Merge cherrypicks of ['googleplex-android-review.googlesource.com/26501529',... (b4366b77) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -403,7 +403,6 @@ package android {
		field @Deprecated public static final String UPDATE_TIME_ZONE_RULES = "android.permission.UPDATE_TIME_ZONE_RULES";
		field public static final String UPGRADE_RUNTIME_PERMISSIONS = "android.permission.UPGRADE_RUNTIME_PERMISSIONS";
		field public static final String USER_ACTIVITY = "android.permission.USER_ACTIVITY";
		field @FlaggedApi("android.hardware.biometrics.face_background_authentication") public static final String USE_BACKGROUND_FACE_AUTHENTICATION = "android.permission.USE_BACKGROUND_FACE_AUTHENTICATION";
		field public static final String USE_COLORIZED_NOTIFICATIONS = "android.permission.USE_COLORIZED_NOTIFICATIONS";
		field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String USE_ON_DEVICE_INTELLIGENCE = "android.permission.USE_ON_DEVICE_INTELLIGENCE";
		field public static final String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";
		@@ -3759,7 +3758,6 @@ package android.content {
		field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String ECM_ENHANCED_CONFIRMATION_SERVICE = "ecm_enhanced_confirmation";
		field public static final String ETHERNET_SERVICE = "ethernet";
		field public static final String EUICC_CARD_SERVICE = "euicc_card";
		field @FlaggedApi("android.hardware.biometrics.face_background_authentication") public static final String FACE_SERVICE = "face";
		field public static final String FONT_SERVICE = "font";
		field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";
		field public static final String MEDIA_TRANSCODING_SERVICE = "media_transcoding";
		@@ -5131,15 +5129,6 @@ package android.hardware.display {

		}

		package android.hardware.face {

		@FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceManager {
		method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @RequiresPermission(android.Manifest.permission.USE_BACKGROUND_FACE_AUTHENTICATION) public void authenticateInBackground(@Nullable java.util.concurrent.Executor, @Nullable android.hardware.biometrics.BiometricPrompt.CryptoObject, @Nullable android.os.CancellationSignal, @NonNull android.hardware.biometrics.BiometricPrompt.AuthenticationCallback);
		method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @RequiresPermission(anyOf={"android.permission.USE_BIOMETRIC_INTERNAL", android.Manifest.permission.USE_BACKGROUND_FACE_AUTHENTICATION}) public boolean hasEnrolledTemplates();
		}

		}

		package android.hardware.hdmi {

		public abstract class HdmiClient {

core/api/test-current.txt

+0 −17

Original line number	Diff line number	Diff line
		@@ -1547,10 +1547,6 @@ package android.hardware.biometrics {
		method public boolean isAllowBackgroundAuthentication();
		}

		public abstract static class BiometricPrompt.AuthenticationCallback {
		method @FlaggedApi("android.hardware.biometrics.face_background_authentication") public void onAuthenticationAcquired(int);
		}

		public static class BiometricPrompt.Builder {
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean);
		method @FlaggedApi("android.multiuser.enable_biometrics_to_unlock_private_space") @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean, boolean);
		@@ -1569,7 +1565,6 @@ package android.hardware.biometrics {
		}

		public class SensorProperties {
		ctor @FlaggedApi("android.hardware.biometrics.face_background_authentication") public SensorProperties(int, int, @NonNull java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo>);
		method @NonNull public java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo> getComponentInfo();
		method public int getSensorId();
		method public int getSensorStrength();
		@@ -1714,18 +1709,6 @@ package android.hardware.display {

		}

		package android.hardware.face {

		@FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceManager {
		method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public android.hardware.biometrics.BiometricTestSession createTestSession(int);
		method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @NonNull public java.util.List<android.hardware.face.FaceSensorProperties> getSensorProperties();
		}

		@FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceSensorProperties extends android.hardware.biometrics.SensorProperties {
		}

		}

		package android.hardware.fingerprint {

		@Deprecated public class FingerprintManager {

core/java/android/content/Context.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -5081,8 +5081,6 @@ public abstract class Context {
		* @see #getSystemService
		* @see android.hardware.face.FaceManager
		*/
		@FlaggedApi(android.hardware.biometrics.Flags.FLAG_FACE_BACKGROUND_AUTHENTICATION)
		@SystemApi
		public static final String FACE_SERVICE = "face";

		/**

core/java/android/hardware/biometrics/BiometricPrompt.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
		import static android.hardware.biometrics.BiometricManager.Authenticators;
		import static android.hardware.biometrics.Flags.FLAG_ADD_KEY_AGREEMENT_CRYPTO_OBJECT;
		import static android.hardware.biometrics.Flags.FLAG_CUSTOM_BIOMETRIC_PROMPT;
		import static android.hardware.biometrics.Flags.FLAG_FACE_BACKGROUND_AUTHENTICATION;
		import static android.hardware.biometrics.Flags.FLAG_GET_OP_ID_CRYPTO_OBJECT;
		import static android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE;

		@@ -1128,8 +1127,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @hide
		*/
		@Override
		@TestApi
		@FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)
		public void onAuthenticationAcquired(int acquireInfo) {}

		/**

core/java/android/hardware/biometrics/SensorProperties.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		package android.hardware.biometrics;

		import static android.hardware.biometrics.Flags.FLAG_FACE_BACKGROUND_AUTHENTICATION;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.TestApi;
		@@ -144,10 +141,8 @@ public class SensorProperties {
		/**
		* @hide
		*/
		@TestApi
		@FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)
		public SensorProperties(int sensorId, @Strength int sensorStrength,
		@NonNull List<ComponentInfo> componentInfo) {
		List<ComponentInfo> componentInfo) {
		mSensorId = sensorId;
		mSensorStrength = sensorStrength;
		mComponentInfo = componentInfo;