Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '66769767b68f3fbe586c153d9d483916e4d9006b':
  Treat the default sound Uri the same as DEFAULT_SOUND.
This commit is contained in:
Daniel Sandler
2013-04-17 09:07:02 -07:00
committed by Android Git Automerger
parent 5bded3bfe1 66769767b6
commit 74c69f1e0c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/NotificationManagerService.java
View File

@@ -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;