[DO NOT MERGE] Change fingerprint reenrollment to acquired message am: 955ea0db05 am: 076ed42ff8 (e89030fd) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/BiometricFingerprintConstants.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,8 @@ public interface BiometricFingerprintConstants {
	FINGERPRINT_ACQUIRED_UNKNOWN,		FINGERPRINT_ACQUIRED_UNKNOWN,
	FINGERPRINT_ACQUIRED_IMMOBILE,		FINGERPRINT_ACQUIRED_IMMOBILE,
	FINGERPRINT_ACQUIRED_TOO_BRIGHT,		FINGERPRINT_ACQUIRED_TOO_BRIGHT,
	FINGERPRINT_ACQUIRED_POWER_PRESSED})		FINGERPRINT_ACQUIRED_POWER_PRESSED,
			FINGERPRINT_ACQUIRED_RE_ENROLL})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@interface FingerprintAcquired {}		@interface FingerprintAcquired {}

	@@ -309,6 +310,12 @@ public interface BiometricFingerprintConstants {
	*/		*/
	int FINGERPRINT_ACQUIRED_POWER_PRESSED = 11;		int FINGERPRINT_ACQUIRED_POWER_PRESSED = 11;

			/**
			* This message is sent to encourage the user to re-enroll their fingerprints.
			* @hide
			*/
			int FINGERPRINT_ACQUIRED_RE_ENROLL = 12;

	/**		/**
	* @hide		* @hide
	*/		*/

packages/SystemUI/src/com/android/systemui/biometrics/BiometricNotificationService.java

+17 −4

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.content.IntentFilter;		import android.content.IntentFilter;
	import android.hardware.biometrics.BiometricFaceConstants;		import android.hardware.biometrics.BiometricFaceConstants;
	import android.hardware.biometrics.BiometricFingerprintConstants;
	import android.hardware.biometrics.BiometricSourceType;		import android.hardware.biometrics.BiometricSourceType;
	import android.os.Handler;		import android.os.Handler;
	import android.os.UserHandle;		import android.os.UserHandle;
	@@ -43,6 +42,9 @@ import com.android.systemui.R;
	import com.android.systemui.dagger.SysUISingleton;		import com.android.systemui.dagger.SysUISingleton;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;


			import java.util.Optional;

	import javax.inject.Inject;		import javax.inject.Inject;

	/**		/**
	@@ -66,6 +68,7 @@ public class BiometricNotificationService implements CoreStartable {
	private final Handler mHandler;		private final Handler mHandler;
	private final NotificationManager mNotificationManager;		private final NotificationManager mNotificationManager;
	private final BiometricNotificationBroadcastReceiver mBroadcastReceiver;		private final BiometricNotificationBroadcastReceiver mBroadcastReceiver;
			private final FingerprintReEnrollNotification mFingerprintReEnrollNotification;
	private NotificationChannel mNotificationChannel;		private NotificationChannel mNotificationChannel;
	private boolean mFaceNotificationQueued;		private boolean mFaceNotificationQueued;
	private boolean mFingerprintNotificationQueued;		private boolean mFingerprintNotificationQueued;
	@@ -102,8 +105,15 @@ public class BiometricNotificationService implements CoreStartable {
	Settings.Secure.putIntForUser(mContext.getContentResolver(),		Settings.Secure.putIntForUser(mContext.getContentResolver(),
	Settings.Secure.FACE_UNLOCK_RE_ENROLL, REENROLL_REQUIRED,		Settings.Secure.FACE_UNLOCK_RE_ENROLL, REENROLL_REQUIRED,
	UserHandle.USER_CURRENT);		UserHandle.USER_CURRENT);
	} else if (msgId == BiometricFingerprintConstants.BIOMETRIC_ERROR_RE_ENROLL		}
	&& biometricSourceType == BiometricSourceType.FINGERPRINT) {		}

			@Override
			public void onBiometricHelp(int msgId, String helpString,
			BiometricSourceType biometricSourceType) {
			if (biometricSourceType == BiometricSourceType.FINGERPRINT
			&& mFingerprintReEnrollNotification.isFingerprintReEnrollRequired(
			msgId)) {
	mFingerprintReenrollRequired = true;		mFingerprintReenrollRequired = true;
	}		}
	}		}
	@@ -115,13 +125,16 @@ public class BiometricNotificationService implements CoreStartable {
	KeyguardUpdateMonitor keyguardUpdateMonitor,		KeyguardUpdateMonitor keyguardUpdateMonitor,
	KeyguardStateController keyguardStateController,		KeyguardStateController keyguardStateController,
	Handler handler, NotificationManager notificationManager,		Handler handler, NotificationManager notificationManager,
	BiometricNotificationBroadcastReceiver biometricNotificationBroadcastReceiver) {		BiometricNotificationBroadcastReceiver biometricNotificationBroadcastReceiver,
			Optional<FingerprintReEnrollNotification> fingerprintReEnrollNotification) {
	mContext = context;		mContext = context;
	mKeyguardUpdateMonitor = keyguardUpdateMonitor;		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
	mKeyguardStateController = keyguardStateController;		mKeyguardStateController = keyguardStateController;
	mHandler = handler;		mHandler = handler;
	mNotificationManager = notificationManager;		mNotificationManager = notificationManager;
	mBroadcastReceiver = biometricNotificationBroadcastReceiver;		mBroadcastReceiver = biometricNotificationBroadcastReceiver;
			mFingerprintReEnrollNotification = fingerprintReEnrollNotification.orElse(
			new FingerprintReEnrollNotificationImpl());
	}		}

	@Override		@Override

packages/SystemUI/src/com/android/systemui/biometrics/FingerprintReEnrollNotification.java

0 → 100644

+25 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2023 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.systemui.biometrics;

			/**
			* Checks if the fingerprint HAL has sent a re-enrollment request.
			*/
			public interface FingerprintReEnrollNotification {
			/** Returns true if msgId corresponds to FINGERPRINT_ACQUIRED_RE_ENROLL. */
			boolean isFingerprintReEnrollRequired(int msgId);
			}

packages/SystemUI/src/com/android/systemui/biometrics/FingerprintReEnrollNotificationImpl.java

0 → 100644

+29 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2023 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.systemui.biometrics;

			import android.hardware.biometrics.BiometricFingerprintConstants;

			/**
			* Checks if the fingerprint HAL has sent a re-enrollment request.
			*/
			public class FingerprintReEnrollNotificationImpl implements FingerprintReEnrollNotification{
			@Override
			public boolean isFingerprintReEnrollRequired(int msgId) {
			return msgId == BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_RE_ENROLL;
			}
			}

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@ import com.android.systemui.appops.dagger.AppOpsModule;
	import com.android.systemui.assist.AssistModule;		import com.android.systemui.assist.AssistModule;
	import com.android.systemui.biometrics.AlternateUdfpsTouchProvider;		import com.android.systemui.biometrics.AlternateUdfpsTouchProvider;
	import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider;		import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider;
			import com.android.systemui.biometrics.FingerprintReEnrollNotification;
	import com.android.systemui.biometrics.UdfpsDisplayModeProvider;		import com.android.systemui.biometrics.UdfpsDisplayModeProvider;
	import com.android.systemui.biometrics.dagger.BiometricsModule;		import com.android.systemui.biometrics.dagger.BiometricsModule;
	import com.android.systemui.biometrics.dagger.UdfpsModule;		import com.android.systemui.biometrics.dagger.UdfpsModule;
	@@ -291,6 +292,9 @@ public abstract class SystemUIModule {
	@BindsOptionalOf		@BindsOptionalOf
	abstract SystemStatusAnimationScheduler optionalSystemStatusAnimationScheduler();		abstract SystemStatusAnimationScheduler optionalSystemStatusAnimationScheduler();

			@BindsOptionalOf
			abstract FingerprintReEnrollNotification optionalFingerprintReEnrollNotification();

	@SysUISingleton		@SysUISingleton
	@Binds		@Binds
	abstract SystemClock bindSystemClock(SystemClockImpl systemClock);		abstract SystemClock bindSystemClock(SystemClockImpl systemClock);