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

Commit a38006d7 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 74c69f1e: am 66769767: Merge "Treat the default sound Uri the same as... 

am 74c69f1e: am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev

* commit '74c69f1e':
  Treat the default sound Uri the same as DEFAULT_SOUND.
parents 8c00be17 74c69f1e

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

+5 −1
Original line number Diff line number Diff line
@@ -1676,8 +1676,12 @@ public class NotificationManagerService extends INotificationManager.Stub 
                .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;