Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0c9b9d2 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

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

parents 3b0205b7 ffcc9769

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

+4 −2
Original line number Diff line number Diff line
@@ -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.