Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2013-06-14 20:29:23 +00:00
committed by Android (Google) Code Review
parent 3b0205b760 ffcc976928
commit a0c9b9d2a7
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);
} 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.