commit 66769767b68f3fbe586c153d9d483916e4d9006b
author Daniel Sandler <dsandler@android.com> Wed Apr 17 16:04:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 17 16:04:33 2013 +0000
tree fc7a8b8a941366f7f28397259a3bfa1ae753bd35
parent 8bba7510bc96d5404c070a4846318ee6a9eb1365
parent 3147523c107a5fecdccdc8083dea3124576331de

Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev

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

diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index fa18e76..3bebf91 100644
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -1676,8 +1676,12 @@
                 .getSystemService(Context.AUDIO_SERVICE);
 
                 // sound
+
+                // should we use the default notification sound? (indicated either by DEFAULT_SOUND
+                // or because notification.sound is pointing at Settings.System.NOTIFICATION_SOUND)
                 final boolean useDefaultSound =
-                    (notification.defaults & Notification.DEFAULT_SOUND) != 0;
+                       (notification.defaults & Notification.DEFAULT_SOUND) != 0
+                    || Settings.System.DEFAULT_NOTIFICATION_URI.equals(notification.sound);
 
                 Uri soundUri = null;
                 boolean hasValidSound = false;