Merge changes from topic "biometric_settings" into sc-dev (801ff1c4) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/IBiometricEnabledOnKeyguardCallback.aidl

+1 −3

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

		package android.hardware.biometrics;

		import android.hardware.biometrics.BiometricSourceType;

		/**
		* @hide
		*/
		oneway interface IBiometricEnabledOnKeyguardCallback {
		void onChanged(in BiometricSourceType type, boolean enabled, int userId);
		void onChanged(boolean enabled, int userId);
		}
		No newline at end of file

core/java/android/provider/Settings.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -9135,6 +9135,20 @@ public final class Settings {
		public static final String BIOMETRIC_DEBUG_ENABLED =
		"biometric_debug_enabled";

		/**
		* Whether or not biometric is allowed on Keyguard.
		* @hide
		*/
		@Readable
		public static final String BIOMETRIC_KEYGUARD_ENABLED = "biometric_keyguard_enabled";

		/**
		* Whether or not biometric is allowed for apps (through BiometricPrompt).
		* @hide
		*/
		@Readable
		public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled";

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

packages/SystemUI/src/com/android/keyguard/KeyguardFaceListenModel.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ data class KeyguardFaceListenModel(
		val isFaceDisabled: Boolean,
		val isBecauseCannotSkipBouncer: Boolean,
		val isKeyguardGoingAway: Boolean,
		val isFaceSettingEnabledForUser: Boolean,
		val isBiometricSettingEnabledForUser: Boolean,
		val isLockIconPressed: Boolean,
		val isScanningAllowedByStrongAuth: Boolean,
		val isPrimaryUser: Boolean,

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+17 −12

Original line number	Diff line number	Diff line
		@@ -353,18 +353,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		}
		};

		private SparseBooleanArray mFaceSettingEnabledForUser = new SparseBooleanArray();
		private SparseBooleanArray mBiometricEnabledForUser = new SparseBooleanArray();
		private BiometricManager mBiometricManager;
		private IBiometricEnabledOnKeyguardCallback mBiometricEnabledCallback =
		new IBiometricEnabledOnKeyguardCallback.Stub() {
		@Override
		public void onChanged(BiometricSourceType type, boolean enabled, int userId)
		throws RemoteException {
		public void onChanged(boolean enabled, int userId) throws RemoteException {
		mHandler.post(() -> {
		if (type == BiometricSourceType.FACE) {
		mFaceSettingEnabledForUser.put(userId, enabled);
		updateFaceListeningState();
		}
		mBiometricEnabledForUser.put(userId, enabled);
		updateBiometricListeningState();
		});
		}
		};
		@@ -1119,6 +1116,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW)
		\|\| containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);
		final boolean isEncrypted = containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_BOOT);

		return isEncrypted \|\| isLockDown;
		}

		@@ -1631,6 +1629,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mLockPatternUtils.registerStrongAuthTracker(mStrongAuthTracker);
		}

		@VisibleForTesting
		void resetBiometricListeningState() {
		mFingerprintRunningState = BIOMETRIC_STATE_STOPPED;
		mFaceRunningState = BIOMETRIC_STATE_STOPPED;
		}

		private void registerRingerTracker() {
		mRingerModeTracker.getRingerMode().observeForever(mRingerModeObserver);
		}
		@@ -1951,7 +1955,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mIsFaceEnrolled = whitelistIpcs(
		() -> mFaceManager != null && mFaceManager.isHardwareDetected()
		&& mFaceManager.hasEnrolledTemplates(userId)
		&& mFaceSettingEnabledForUser.get(userId));
		&& mBiometricEnabledForUser.get(userId));
		}

		/**
		@@ -2099,7 +2103,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		shouldListenForFingerprintAssistant() \|\| (mKeyguardOccluded && mIsDreaming))
		&& !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())
		&& (!mKeyguardGoingAway \|\| !mDeviceInteractive) && mIsPrimaryUser
		&& allowedOnBouncer;
		&& allowedOnBouncer && mBiometricEnabledForUser.get(getCurrentUser());
		return shouldListen;
		}

		@@ -2158,7 +2162,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		(mBouncer \|\| mAuthInterruptActive \|\| awakeKeyguard
		\|\| shouldListenForFaceAssistant())
		&& !mSwitchingUser && !isFaceDisabled(user) && becauseCannotSkipBouncer
		&& !mKeyguardGoingAway && mFaceSettingEnabledForUser.get(user) && !mLockIconPressed
		&& !mKeyguardGoingAway && mBiometricEnabledForUser.get(user) && !mLockIconPressed
		&& strongAuthAllowsScanning && mIsPrimaryUser
		&& !mSecureCameraLaunched;

		@@ -2176,7 +2180,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		isFaceDisabled(user),
		becauseCannotSkipBouncer,
		mKeyguardGoingAway,
		mFaceSettingEnabledForUser.get(user),
		mBiometricEnabledForUser.get(user),
		mLockIconPressed,
		strongAuthAllowsScanning,
		mIsPrimaryUser,
		@@ -3235,6 +3239,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		pw.println(" strongAuthFlags=" + Integer.toHexString(strongAuthFlags));
		pw.println(" trustManaged=" + getUserTrustIsManaged(userId));
		pw.println(" udfpsEnrolled=" + isUdfpsEnrolled());
		pw.println(" enabledByUser=" + mBiometricEnabledForUser.get(userId));
		if (isUdfpsEnrolled()) {
		pw.println(" shouldListenForUdfps=" + shouldListenForUdfps());
		pw.println(" bouncerVisible=" + mBouncer);
		@@ -3257,7 +3262,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		pw.println(" possible=" + isUnlockWithFacePossible(userId));
		pw.println(" strongAuthFlags=" + Integer.toHexString(strongAuthFlags));
		pw.println(" trustManaged=" + getUserTrustIsManaged(userId));
		pw.println(" enabledByUser=" + mFaceSettingEnabledForUser.get(userId));
		pw.println(" enabledByUser=" + mBiometricEnabledForUser.get(userId));
		pw.println(" mSecureCameraLaunched=" + mSecureCameraLaunched);
		}
		if (mFaceListenModels != null && !mFaceListenModels.isEmpty()) {

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.pm.ServiceInfo;
		import android.hardware.biometrics.BiometricManager;
		import android.hardware.biometrics.BiometricSourceType;
		import android.hardware.biometrics.ComponentInfoInternal;
		import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;
		import android.hardware.face.FaceManager;
		@@ -188,8 +187,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		when(mSpiedContext.getPackageManager()).thenReturn(mPackageManager);
		doAnswer(invocation -> {
		IBiometricEnabledOnKeyguardCallback callback = invocation.getArgument(0);
		callback.onChanged(BiometricSourceType.FACE, true /* enabled */,
		KeyguardUpdateMonitor.getCurrentUser());
		callback.onChanged(true /* enabled */, KeyguardUpdateMonitor.getCurrentUser());
		return null;
		}).when(mBiometricManager).registerEnabledOnKeyguardCallback(any());
		when(mFaceManager.isHardwareDetected()).thenReturn(true);
		@@ -495,6 +493,11 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		}

		private void testFingerprintWhenStrongAuth(int strongAuth) {
		// Clear invocations, since previous setup (e.g. registering BiometricManager callbacks)
		// will trigger updateBiometricListeningState();
		clearInvocations(mFingerprintManager);
		mKeyguardUpdateMonitor.resetBiometricListeningState();

		when(mStrongAuthTracker.getStrongAuthForUser(anyInt())).thenReturn(strongAuth);
		mKeyguardUpdateMonitor.dispatchStartedGoingToSleep(0 /* why */);
		mTestableLooper.processAllMessages();