diff options
| author | Espen Fjellvær Olsen <espen@mrfjo.org> | 2013-02-17 11:31:33 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-02-17 02:51:42 -0800 |
| commit | 85b355fa7bfb2d1c29166531a79b0bc0a22df9d7 (patch) | |
| tree | 0f531879811f5f01c5fca079d0c111b9991c7783 /services/java/com/android/server/NotificationManagerService.java | |
| parent | e583f27f0cc20b85f6d9e06025b025e096e5dfd0 (diff) | |
| download | frameworks_base-85b355fa7bfb2d1c29166531a79b0bc0a22df9d7.zip frameworks_base-85b355fa7bfb2d1c29166531a79b0bc0a22df9d7.tar.gz frameworks_base-85b355fa7bfb2d1c29166531a79b0bc0a22df9d7.tar.bz2 | |
Fix Quiet Hours not muting notification sounds
4.2.2 touched the NotificationManager service, and some logic went missing in the merge it seems.
This should take care of it.
Change-Id: Ib3b88c83d2936871fbe25f1acbd10fd60c577944
Diffstat (limited to 'services/java/com/android/server/NotificationManagerService.java')
| -rwxr-xr-x | services/java/com/android/server/NotificationManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 41ef166..9087997 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -1230,7 +1230,7 @@ public class NotificationManagerService extends INotificationManager.Stub ContentResolver resolver = mContext.getContentResolver(); hasValidSound = Settings.System.getString(resolver, Settings.System.NOTIFICATION_SOUND) != null; - } else if (notification.sound != null) { + } else if (!(inQuietHours && mQuietHoursMute) && notification.sound != null) { soundUri = notification.sound; hasValidSound = (soundUri != null); } |
