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

Commit 20172c6f authored by Wenhui Yang's avatar Wenhui Yang Committed by Automerger Merge Worker
Browse files

Merge "Fix talkback announce "system status" for frr notification" into udc-qpr-dev am: 8f722085 

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



Change-Id: I7b7d78fd2d56712532d840f7b11782bf6e2fa1b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 903ba87d 8f722085

services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java

+11 −9
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ public class BiometricNotificationUtils { 
                null /* options */, UserHandle.CURRENT);



        showNotificationHelper(context, name, title, content, pendingIntent, FACE_RE_ENROLL_CHANNEL,

                FACE_RE_ENROLL_NOTIFICATION_TAG, Notification.VISIBILITY_SECRET);

                Notification.CATEGORY_SYSTEM, FACE_RE_ENROLL_NOTIFICATION_TAG,

                Notification.VISIBILITY_SECRET);

    }



    /**
@@ -101,7 +102,8 @@ public class BiometricNotificationUtils { 
                null /* options */, UserHandle.CURRENT);



        showNotificationHelper(context, name, title, content, pendingIntent, FACE_ENROLL_CHANNEL,

                FACE_ENROLL_NOTIFICATION_TAG, Notification.VISIBILITY_PUBLIC);

                Notification.CATEGORY_RECOMMENDATION, FACE_ENROLL_NOTIFICATION_TAG,

                Notification.VISIBILITY_PUBLIC);

    }



    /**
@@ -124,8 +126,8 @@ public class BiometricNotificationUtils { 
                null /* options */, UserHandle.CURRENT);



        showNotificationHelper(context, name, title, content, pendingIntent,

                FINGERPRINT_ENROLL_CHANNEL, FINGERPRINT_ENROLL_NOTIFICATION_TAG,

                Notification.VISIBILITY_PUBLIC);

                Notification.CATEGORY_RECOMMENDATION, FINGERPRINT_ENROLL_CHANNEL,

                FINGERPRINT_ENROLL_NOTIFICATION_TAG, Notification.VISIBILITY_PUBLIC);

    }



    /**
@@ -159,13 +161,13 @@ public class BiometricNotificationUtils { 
                null /* options */, UserHandle.CURRENT);



        showNotificationHelper(context, name, title, content, pendingIntent,

                FINGERPRINT_BAD_CALIBRATION_CHANNEL, BAD_CALIBRATION_NOTIFICATION_TAG,

                Notification.VISIBILITY_SECRET);

                Notification.CATEGORY_SYSTEM, FINGERPRINT_BAD_CALIBRATION_CHANNEL,

                BAD_CALIBRATION_NOTIFICATION_TAG, Notification.VISIBILITY_SECRET);

    }



    private static void showNotificationHelper(Context context, String name, String title,

                String content, PendingIntent pendingIntent, String channelName,

                String notificationTag, int visibility) {

                String content, PendingIntent pendingIntent, String category,

                String channelName, String notificationTag, int visibility) {

        final NotificationManager notificationManager =

                context.getSystemService(NotificationManager.class);

        final NotificationChannel channel = new NotificationChannel(channelName, name,
@@ -178,7 +180,7 @@ public class BiometricNotificationUtils { 
                .setOnlyAlertOnce(true)

                .setLocalOnly(true)

                .setAutoCancel(true)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setCategory(category)

                .setContentIntent(pendingIntent)

                .setVisibility(visibility)

                .build();