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

* commit '9bc3386e1dfacf6544039dc9f66d07b827632f23':
  Once again, cancel all when notifications canceled for pkg.
This commit is contained in:
Daniel Sandler
2013-04-18 16:19:47 -07:00
committed by Android Git Automerger

View File

@@ -450,11 +450,16 @@ public class NotificationManagerService extends INotificationManager.Stub
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));
}
}