drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev

Browse Source 
* commit 'a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be':
  Temporarily restore some support for icon==0 notifications.
This commit is contained in:
Daniel Sandler
2013-06-14 13:34:55 -07:00
committed by Android Git Automerger
parent 478471b579 a0c9b9d2a7
commit 5be52fb5ae
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/NotificationManagerService.java
View File

@ -1753,7 +1753,7 @@ public class NotificationManagerService extends INotificationManager.Stub
notifyPostedLocked(r); notifyPostedLocked(r);
} else { } 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) { if (old != null && old.statusBarKey != null) {
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
@ -1765,7 +1765,9 @@ public class NotificationManagerService extends INotificationManager.Stub
notifyRemovedLocked(r); 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. // If we're not supposed to beep, vibrate, etc. then don't.