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

Commit 648c03b7 authored by Christoph Studer's avatar Christoph Studer Committed by Android Git Automerger
Browse files

am dd63df29: Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev 

* commit 'dd63df2961408f35182b9fab98e51eb5f8c26184':
  NoMan: Use Notification.isGroupX() methods
parents f31e1cef 4d953d0e

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

+2 −3
Original line number Diff line number Diff line
@@ -2333,7 +2333,7 @@ public class NotificationManagerService extends SystemService { 
    private void cancelGroupChildrenLocked(NotificationRecord r, int callingUid, int callingPid,

            String listenerName) {

        Notification n = r.getNotification();

        if (n.getGroup() == null || (n.flags & Notification.FLAG_GROUP_SUMMARY) == 0) {

        if (!n.isGroupSummary()) {

            return;

        }
@@ -2508,8 +2508,7 @@ public class NotificationManagerService extends SystemService { 
            return false;

        }

        Notification n = sbn.getNotification();

        if (listener.targetSdkVersion < Build.VERSION_CODES.L &&

                n.getGroup() != null && (n.flags & Notification.FLAG_GROUP_SUMMARY) == 0)  {

        if (listener.targetSdkVersion < Build.VERSION_CODES.L && n.isGroupChild())  {

            return false;

        }

        return true;