From 85b355fa7bfb2d1c29166531a79b0bc0a22df9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Espen=20Fjellv=C3=A6r=20Olsen?= <espen@mrfjo.org>
Date: Sun, 17 Feb 2013 11:31:33 +0100
Subject: 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
---
 services/java/com/android/server/NotificationManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '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 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);
                 }
-- 
cgit v1.1