commit 9bc3386e1dfacf6544039dc9f66d07b827632f23
author Daniel Sandler <dsandler@android.com> Thu Apr 18 23:15:50 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 18 23:15:51 2013 +0000
tree 53b9f819320bd9175345d76608d817025e71aa80
parent a454c5732cacffdda53ae277b1e43d87b43044b1
parent 32e698b12fc85a25463d536fb6f231f14a07b448

Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev

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

diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 3bebf91..9a93f63 100644
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -450,11 +450,16 @@
 
     public void setNotificationsEnabledForPackage(String pkg, int uid, boolean enabled) {
         checkCallerIsSystem();
-        if (true||DBG) {
-            Slog.v(TAG, (enabled?"en":"dis") + "abling notifications for " + pkg);
-        }
+
+        Slog.v(TAG, (enabled?"en":"dis") + "abling notifications for " + pkg);
+
         mAppOps.setMode(AppOpsManager.OP_POST_NOTIFICATION, uid, pkg,
                 enabled ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
+
+        // Now, cancel any outstanding notifications that are part of a just-disabled app
+        if (ENABLE_BLOCKED_NOTIFICATIONS && !enabled) {
+            cancelAllNotificationsInt(pkg, 0, 0, true, UserHandle.getUserId(uid));
+        }
     }