Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e4d363f authored by Diya Bera's avatar Diya Bera Committed by Android (Google) Code Review
Browse files

Merge changes from topic "main_reenroll" into main 

* changes:
  Remove duplicate face re-enroll notification
  Change fingerprint reenrollment to acquired message
parents 5a9c8500 a02b386d

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

+8 −1
Original line number Diff line number Diff line
@@ -218,7 +218,8 @@ public interface BiometricFingerprintConstants { 
            FINGERPRINT_ACQUIRED_UNKNOWN,

            FINGERPRINT_ACQUIRED_IMMOBILE,

            FINGERPRINT_ACQUIRED_TOO_BRIGHT,

            FINGERPRINT_ACQUIRED_POWER_PRESSED})

            FINGERPRINT_ACQUIRED_POWER_PRESSED,

            FINGERPRINT_ACQUIRED_RE_ENROLL})

    @Retention(RetentionPolicy.SOURCE)

    @interface FingerprintAcquired {}
@@ -309,6 +310,12 @@ public interface BiometricFingerprintConstants { 
     */

    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

     */

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

+52 −8
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import static android.app.PendingIntent.FLAG_IMMUTABLE; 
import static com.android.systemui.biometrics.BiometricNotificationBroadcastReceiver.ACTION_SHOW_FACE_REENROLL_DIALOG;

import static com.android.systemui.biometrics.BiometricNotificationBroadcastReceiver.ACTION_SHOW_FINGERPRINT_REENROLL_DIALOG;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;

import android.app.NotificationChannel;

import android.app.NotificationManager;
@@ -29,8 +31,10 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.hardware.biometrics.BiometricFaceConstants;

import android.hardware.biometrics.BiometricFingerprintConstants;

import android.hardware.biometrics.BiometricSourceType;

import android.hardware.biometrics.BiometricStateListener;

import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;
@@ -43,6 +47,8 @@ import com.android.systemui.R; 
import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.statusbar.policy.KeyguardStateController;



import java.util.Optional;



import javax.inject.Inject;



/**
@@ -66,6 +72,9 @@ public class BiometricNotificationService implements CoreStartable { 
    private final Handler mHandler;

    private final NotificationManager mNotificationManager;

    private final BiometricNotificationBroadcastReceiver mBroadcastReceiver;

    private final FingerprintReEnrollNotification mFingerprintReEnrollNotification;

    private final FingerprintManager mFingerprintManager;

    private final FaceManager mFaceManager;

    private NotificationChannel mNotificationChannel;

    private boolean mFaceNotificationQueued;

    private boolean mFingerprintNotificationQueued;
@@ -102,26 +111,53 @@ public class BiometricNotificationService implements CoreStartable { 
                        Settings.Secure.putIntForUser(mContext.getContentResolver(),

                                Settings.Secure.FACE_UNLOCK_RE_ENROLL, REENROLL_REQUIRED,

                                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;

                    }

                }

            };



    private final BiometricStateListener mFaceStateListener = new BiometricStateListener() {

        @Override

        public void onEnrollmentsChanged(int userId, int sensorId, boolean hasEnrollments) {

            mNotificationManager.cancelAsUser(TAG, FACE_NOTIFICATION_ID, UserHandle.CURRENT);

        }

    };



    private final BiometricStateListener mFingerprintStateListener = new BiometricStateListener() {

        @Override

        public void onEnrollmentsChanged(int userId, int sensorId, boolean hasEnrollments) {

            mNotificationManager.cancelAsUser(TAG, FINGERPRINT_NOTIFICATION_ID, UserHandle.CURRENT);

        }

    };



    @Inject

    public BiometricNotificationService(Context context,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardStateController keyguardStateController,

            Handler handler, NotificationManager notificationManager,

            BiometricNotificationBroadcastReceiver biometricNotificationBroadcastReceiver) {

    public BiometricNotificationService(@NonNull Context context,

            @NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,

            @NonNull KeyguardStateController keyguardStateController,

            @NonNull Handler handler, @NonNull NotificationManager notificationManager,

            @NonNull BiometricNotificationBroadcastReceiver biometricNotificationBroadcastReceiver,

            @NonNull Optional<FingerprintReEnrollNotification> fingerprintReEnrollNotification,

            @Nullable FingerprintManager fingerprintManager,

            @Nullable FaceManager faceManager) {

        mContext = context;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mKeyguardStateController = keyguardStateController;

        mHandler = handler;

        mNotificationManager = notificationManager;

        mBroadcastReceiver = biometricNotificationBroadcastReceiver;

        mFingerprintReEnrollNotification = fingerprintReEnrollNotification.orElse(

                new FingerprintReEnrollNotificationImpl());

        mFingerprintManager = fingerprintManager;

        mFaceManager = faceManager;

    }



    @Override
@@ -135,12 +171,19 @@ public class BiometricNotificationService implements CoreStartable { 
        intentFilter.addAction(ACTION_SHOW_FACE_REENROLL_DIALOG);

        mContext.registerReceiver(mBroadcastReceiver, intentFilter,

                Context.RECEIVER_EXPORTED_UNAUDITED);

        if (mFingerprintManager != null) {

            mFingerprintManager.registerBiometricStateListener(mFingerprintStateListener);

        }

        if (mFaceManager != null) {

            mFaceManager.registerBiometricStateListener(mFaceStateListener);

        }

        Settings.Secure.putIntForUser(mContext.getContentResolver(),

                Settings.Secure.FACE_UNLOCK_RE_ENROLL, REENROLL_NOT_REQUIRED,

                UserHandle.USER_CURRENT);

    }



    private void queueFaceReenrollNotification() {

        Log.d(TAG, "Face re-enroll notification queued.");

        mFaceNotificationQueued = true;

        final String title = mContext.getString(R.string.face_re_enroll_notification_title);

        final String content = mContext.getString(
@@ -153,6 +196,7 @@ public class BiometricNotificationService implements CoreStartable { 
    }



    private void queueFingerprintReenrollNotification() {

        Log.d(TAG, "Fingerprint re-enroll notification queued.");

        mFingerprintNotificationQueued = true;

        final String title = mContext.getString(R.string.fingerprint_re_enroll_notification_title);

        final String content = mContext.getString(

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

0 → 100644
+29 −0
Original line number 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 interface FingerprintReEnrollNotification {

    //TODO: Remove this class and add a constant in the HAL API instead (b/281841852)

    /** Returns true if msgId corresponds to FINGERPRINT_ACQUIRED_RE_ENROLL. */

    boolean isFingerprintReEnrollRequired(

            @BiometricFingerprintConstants.FingerprintAcquired int msgId);

}

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

0 → 100644
+29 −0
Original line number 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 Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.assist.AssistModule; 
import com.android.systemui.authentication.AuthenticationModule;

import com.android.systemui.biometrics.AlternateUdfpsTouchProvider;

import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider;

import com.android.systemui.biometrics.FingerprintReEnrollNotification;

import com.android.systemui.biometrics.UdfpsDisplayModeProvider;

import com.android.systemui.biometrics.dagger.BiometricsModule;

import com.android.systemui.bouncer.ui.BouncerViewModule;
@@ -299,6 +300,9 @@ public abstract class SystemUIModule { 
    @BindsOptionalOf

    abstract SystemStatusAnimationScheduler optionalSystemStatusAnimationScheduler();



    @BindsOptionalOf

    abstract FingerprintReEnrollNotification optionalFingerprintReEnrollNotification();



    @SysUISingleton

    @Binds

    abstract SystemClock bindSystemClock(SystemClockImpl systemClock);