diff options
author | Daniel Sandler <dsandler@android.com> | 2013-06-14 20:29:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-14 20:29:24 +0000 |
commit | a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be (patch) | |
tree | 270739528966ce25faeed2a783e7432b82493657 | |
parent | 3b0205b7601a6fa3d7abf6dbc5a60223981103cc (diff) | |
parent | ffcc976928f5709b4689b479e3885b3fdaf8b8b6 (diff) | |
download | frameworks_base-a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be.zip frameworks_base-a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be.tar.gz frameworks_base-a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be.tar.bz2 |
Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
-rw-r--r-- | services/java/com/android/server/NotificationManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 5dc8e0c..29aaeaf 100644 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -1753,7 +1753,7 @@ public class NotificationManagerService extends INotificationManager.Stub notifyPostedLocked(r); } else { - Slog.e(TAG, "Ignoring notification with icon==0: " + notification); + Slog.e(TAG, "Not posting notification with icon==0: " + notification); if (old != null && old.statusBarKey != null) { long identity = Binder.clearCallingIdentity(); try { @@ -1765,7 +1765,9 @@ public class NotificationManagerService extends INotificationManager.Stub notifyRemovedLocked(r); } - return; // do not play sounds, show lights, etc. for invalid notifications + // ATTENTION: in a future release we will bail out here + // so that we do not play sounds, show lights, etc. for invalid notifications + Slog.e(TAG, "WARNING: In a future release this will crash the app: " + n.getPackageName()); } // If we're not supposed to beep, vibrate, etc. then don't. |