From 333f8dd78f8926dfb8851dbb23333c9f5553e69f Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Tue, 22 Jul 2014 20:39:58 -0400
Subject: [PATCH] Wire up CATEGORY_ALARM and CATEGORY_EVENT.

And remove the alarm package whitelist now that deskclock
uses a category.

Bug:16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
---
 .../java/com/android/server/notification/ZenModeHelper.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 8e625c5b94549..a896550e6e4fa 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -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) {