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

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

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

* commit '66769767':
  Treat the default sound Uri the same as DEFAULT_SOUND.
parents 5bded3bf 66769767

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -1676,8 +1676,12 @@ public class NotificationManagerService extends INotificationManager.Stub 
                .getSystemService(Context.AUDIO_SERVICE);

                .getSystemService(Context.AUDIO_SERVICE);





                // sound

                // 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 =

                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;

                Uri soundUri = null;

                boolean hasValidSound = false;

                boolean hasValidSound = false;