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

Commit 5c6a00f8 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "FLAG_FOREGROUND_SERVICE requires a running FGS" into udc-dev am: c16dfd25 

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



Change-Id: I0724b636a511af83deba213326c91496424a06fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbba422d c16dfd25

core/java/android/app/Notification.java

+4 −2
Original line number Diff line number Diff line
@@ -6992,8 +6992,10 @@ public class Notification implements Parcelable 
    /**

     * Returns whether an app can colorize due to the android.permission.USE_COLORIZED_NOTIFICATIONS

     * permission. The permission is checked when a notification is enqueued.

     *

     * @hide

     */

    private boolean hasColorizedPermission() {

    public boolean hasColorizedPermission() {

        return (flags & Notification.FLAG_CAN_COLORIZE) != 0;

    }

































services/core/java/com/android/server/notification/NotificationManagerService.java



+17
−11




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package com.android.server.notification;





























import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;













import static android.app.ActivityManagerInternal.ServiceNotificationPolicy.NOT_FOREGROUND_SERVICE;















import static android.app.AppOpsManager.MODE_ALLOWED;















import static android.app.Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION;















import static android.app.Notification.FLAG_AUTOGROUP_SUMMARY;










@@ -6517,9 +6518,17 @@ public class NotificationManagerService extends SystemService {



























        checkRestrictedCategories(notification);



























        // Notifications passed to setForegroundService() have FLAG_FOREGROUND_SERVICE,













        // but it's also possible that the app has called notify() with an update to an













        // FGS notification that hasn't yet been displayed.  Make sure we check for any













        // FGS-related situation up front, outside of any locks so it's safe to call into













        // the Activity Manager.













        final ServiceNotificationPolicy policy = mAmi.applyForegroundServiceNotification(













                notification, tag, id, pkg, userId);



























        // Fix the notification as best we can.















        try {













            fixNotification(notification, pkg, tag, id, userId, notificationUid);













            fixNotification(notification, pkg, tag, id, userId, notificationUid, policy);















        } catch (Exception e) {















            if (notification.isForegroundService()) {















                throw new SecurityException("Invalid FGS notification", e);









@@ -6528,13 +6537,7 @@ public class NotificationManagerService extends SystemService {













            return;















        }



























        // Notifications passed to setForegroundService() have FLAG_FOREGROUND_SERVICE,













        // but it's also possible that the app has called notify() with an update to an













        // FGS notification that hasn't yet been displayed.  Make sure we check for any













        // FGS-related situation up front, outside of any locks so it's safe to call into













        // the Activity Manager.













        final ServiceNotificationPolicy policy = mAmi.applyForegroundServiceNotification(













                notification, tag, id, pkg, userId);



























        if (policy == ServiceNotificationPolicy.UPDATE_ONLY) {















            // Proceed if the notification is already showing/known, otherwise ignore















            // because the service lifecycle logic has retained responsibility for its










@@ -6707,14 +6710,17 @@ public class NotificationManagerService extends SystemService {



























    @VisibleForTesting















    protected void fixNotification(Notification notification, String pkg, String tag, int id,













            @UserIdInt int userId, int notificationUid) throws NameNotFoundException,













            RemoteException {

























            @UserIdInt int userId, int notificationUid, ServiceNotificationPolicy fgsPolicy)













            throws NameNotFoundException, RemoteException {















        final ApplicationInfo ai = mPackageManagerClient.getApplicationInfoAsUser(















                pkg, PackageManager.MATCH_DEBUG_TRIAGED_MISSING,















                (userId == UserHandle.USER_ALL) ? USER_SYSTEM : userId);















        Notification.addFieldsFromContext(ai, notification);



























        if (notification.isForegroundService() && fgsPolicy == NOT_FOREGROUND_SERVICE) {













            notification.flags &= ~FLAG_FOREGROUND_SERVICE;













        }



























        // Only notifications that can be non-dismissible can have the flag FLAG_NO_DISMISS















        if (mFlagResolver.isEnabled(ALLOW_DISMISS_ONGOING)) {















            if (((notification.flags & FLAG_ONGOING_EVENT) > 0)

































services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java



+130
−14


























File changed.
Preview size limit exceeded, changes collapsed.