Merge "Merge changes from topic "face-logging" into qt-dev am: a0d2d2021d" into qt-dev-plus-aosp (32866527) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -8163,6 +8163,13 @@ public final class Settings {
		private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not debugging is enabled.
		* @hide
		*/
		public static final String BIOMETRIC_DEBUG_ENABLED =
		"biometric_debug_enabled";

		/**
		* Whether the assist gesture should be enabled.
		*

+2 −1

Original line number	Diff line number	Diff line
		@@ -708,7 +708,8 @@ public class SettingsBackupTest {
		Settings.Secure.FLASHLIGHT_ENABLED,
		Settings.Secure.CROSS_PROFILE_CALENDAR_ENABLED,
		Settings.Secure.LOCATION_ACCESS_CHECK_INTERVAL_MILLIS,
		Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS);
		Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,
		Settings.Secure.BIOMETRIC_DEBUG_ENABLED);

		@Test
		public void systemSettingsBackedUpOrBlacklisted() {

+2 −2

Original line number	Diff line number	Diff line
		@@ -120,8 +120,8 @@ public abstract class AuthenticationClient extends ClientMonitor {
		@Override
		public boolean onAuthenticated(BiometricAuthenticator.Identifier identifier,
		boolean authenticated, ArrayList<Byte> token) {
		super.logOnAuthenticated(authenticated, mRequireConfirmation, getTargetUserId(),
		isBiometricPrompt());
		super.logOnAuthenticated(getContext(), authenticated, mRequireConfirmation,
		getTargetUserId(), isBiometricPrompt());

		final BiometricServiceBase.ServiceListener listener = getListener();

+4 −2

Original line number	Diff line number	Diff line
		@@ -1054,7 +1054,8 @@ public class BiometricService extends SystemService {
		BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT,
		mCurrentAuthSession.mRequireConfirmation,
		StatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED,
		latency);
		latency,
		Utils.isDebugEnabled(getContext(), mCurrentAuthSession.mUserId));
		} else {
		int error = reason == BiometricPrompt.DISMISSED_REASON_NEGATIVE
		? BiometricConstants.BIOMETRIC_ERROR_NEGATIVE_BUTTON
		@@ -1077,7 +1078,8 @@ public class BiometricService extends SystemService {
		BiometricsProtoEnums.ACTION_AUTHENTICATE,
		BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT,
		error,
		0 /* vendorCode */);
		0 /* vendorCode */,
		Utils.isDebugEnabled(getContext(), mCurrentAuthSession.mUserId));
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ public abstract class ClientMonitor extends LoggableMonitor implements IBinder.D
		* @return true if client should be removed
		*/
		public boolean onAcquired(int acquiredInfo, int vendorCode) {
		super.logOnAcquired(acquiredInfo, vendorCode, getTargetUserId());
		super.logOnAcquired(mContext, acquiredInfo, vendorCode, getTargetUserId());
		if (DEBUG) Slog.v(getLogTag(), "Acquired: " + acquiredInfo + " " + vendorCode);
		try {
		if (mListener != null) {
		@@ -182,7 +182,7 @@ public abstract class ClientMonitor extends LoggableMonitor implements IBinder.D
		* @return true if client should be removed
		*/
		public boolean onError(long deviceId, int error, int vendorCode) {
		super.logOnError(error, vendorCode, getTargetUserId());
		super.logOnError(mContext, error, vendorCode, getTargetUserId());
		try {
		if (mListener != null) {
		mListener.onError(deviceId, error, vendorCode, getCookie());