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

Commit c818f7f0 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Add re-enrollment notification for face AIDL" into sc-dev am: eef75a48 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13670657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5868268bfd3c2f6854dbf9ef8ad8d19d4e18a97a
parents 620a1098 eef75a48

core/java/android/hardware/biometrics/BiometricConstants.java

+6 −0
Original line number Diff line number Diff line
@@ -144,6 +144,12 @@ public interface BiometricConstants { 
     */

    int BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED = 15;



    /**

     * Authentication cannot proceed because re-enrollment is required.

     * @hide

     */

    int BIOMETRIC_ERROR_RE_ENROLL = 16;



    /**

     * This constant is only used by SystemUI. It notifies SystemUI that authentication was paused

     * because the authentication attempt was unsuccessful.

core/java/android/hardware/biometrics/BiometricFaceConstants.java

+6 −0
Original line number Diff line number Diff line
@@ -152,6 +152,12 @@ public interface BiometricFaceConstants { 
     */

    int BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED = 15;



    /**

     * Authentication cannot proceed because re-enrollment is required.

     * @hide

     */

    int BIOMETRIC_ERROR_RE_ENROLL = 16;



    /**

     * @hide

     */

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

+6 −0
Original line number Diff line number Diff line
@@ -165,6 +165,12 @@ public interface BiometricFingerprintConstants { 
     */

    public static final int BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED = 15;



    /**

     * Authentication cannot proceed because re-enrollment is required.

     * @hide

     */

    int BIOMETRIC_ERROR_RE_ENROLL = 16;



    /**

     * @hide

     */

core/java/android/hardware/face/FaceManager.java

+3 −0
Original line number Diff line number Diff line
@@ -831,6 +831,9 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
            case BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED:

                return context.getString(

                        com.android.internal.R.string.face_error_security_update_required);

            case BIOMETRIC_ERROR_RE_ENROLL:

                return context.getString(

                        com.android.internal.R.string.face_recalibrate_notification_content);

            case FACE_ERROR_VENDOR: {

                String[] msgArray = context.getResources().getStringArray(

                        com.android.internal.R.array.face_error_vendor);

services/core/java/com/android/server/biometrics/sensors/face/ReEnrollNotificationUtils.java

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.server.biometrics.sensors.face;



import android.annotation.NonNull;

import android.app.Notification;

import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;



import com.android.internal.R;



public class ReEnrollNotificationUtils {



    private static final String NOTIFICATION_TAG = "FaceService";

    private static final int NOTIFICATION_ID = 1;



    public static void showReEnrollmentNotification(@NonNull Context context) {

        final NotificationManager notificationManager =

                context.getSystemService(NotificationManager.class);



        final String name =

                context.getString(R.string.face_recalibrate_notification_name);

        final String title =

                context.getString(R.string.face_recalibrate_notification_title);

        final String content =

                context.getString(R.string.face_recalibrate_notification_content);



        final Intent intent = new Intent("android.settings.FACE_SETTINGS");

        intent.setPackage("com.android.settings");



        final PendingIntent pendingIntent = PendingIntent.getActivityAsUser(context,

                0 /* requestCode */, intent, PendingIntent.FLAG_IMMUTABLE /* flags */,

                null /* options */, UserHandle.CURRENT);



        final String channelName = "FaceEnrollNotificationChannel";



        final NotificationChannel channel = new NotificationChannel(channelName, name,

                NotificationManager.IMPORTANCE_HIGH);

        final Notification notification = new Notification.Builder(context, channelName)

                .setSmallIcon(R.drawable.ic_lock)

                .setContentTitle(title)

                .setContentText(content)

                .setSubText(name)

                .setOnlyAlertOnce(true)

                .setLocalOnly(true)

                .setAutoCancel(true)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setContentIntent(pendingIntent)

                .setVisibility(Notification.VISIBILITY_SECRET)

                .build();



        notificationManager.createNotificationChannel(channel);

        notificationManager.notifyAsUser(NOTIFICATION_TAG,

                NOTIFICATION_ID, notification,

                UserHandle.CURRENT);

    }



    public static void cancelNotification(@NonNull Context context) {

        final NotificationManager notificationManager =

                context.getSystemService(NotificationManager.class);

        notificationManager.cancelAsUser(NOTIFICATION_TAG, NOTIFICATION_ID, UserHandle.CURRENT);

    }



}