Revert "Merge "Allow notifications to not specify a contentIntent.""

This reverts commit 8885321046, reversing changes made to 61b8aaadd7.
2010-10-08 16:22:53 -07:00
parent 1cb9465372
commit 39b4867d48
5 changed files with 5 additions and 37 deletions
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -741,6 +741,10 @@ public class NotificationManagerService extends INotificationManager.Stub
                throw new IllegalArgumentException("contentView required: pkg=" + pkg
                        + " id=" + id + " notification=" + notification);
            }
+            if (notification.contentIntent == null) {
+                throw new IllegalArgumentException("contentIntent required: pkg=" + pkg
+                        + " id=" + id + " notification=" + notification);
+            }
        }

        synchronized (mNotificationList) {