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

Commit fc04b1d8 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 064c40c0: Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev 

* commit '064c40c06abf2cb3d33d8a105a6e5e135481ae89':
  Wire up CATEGORY_ALARM and CATEGORY_EVENT.
parents c3acde57 79cac9d0

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

+2 −4
Original line number Diff line number Diff line
@@ -90,9 +90,6 @@ public class ZenModeHelper { 
            "com.android.mms",

            "com.android.example.notificationshowcase"

            ));

    private static final Set<String> ALARM_PACKAGES = new HashSet<String>(Arrays.asList(

            "com.google.android.deskclock"

            ));

    private static final Set<String> SYSTEM_PACKAGES = new HashSet<String>(Arrays.asList(

            "android",

            "com.android.systemui"
@@ -313,7 +310,8 @@ public class ZenModeHelper { 
    }



    private boolean isAlarm(NotificationRecord record) {

        return ALARM_PACKAGES.contains(record.sbn.getPackageName());

        return record.isCategory(Notification.CATEGORY_ALARM)

                || record.isCategory(Notification.CATEGORY_EVENT);

    }



    private boolean isCall(NotificationRecord record) {