summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2012-02-14 12:37:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-14 12:37:16 -0800
commitb9be8eff222d9b70079dd53d0d61de229d8d7914 (patch)
tree8c8ebb14a3df4ee22a768128309752eb092fa8dd
parent252c64f9c3e2e357f8687e18d8a066cc1cdb8c15 (diff)
parentffc89899652f5c815b6d156f55a909001420891e (diff)
downloadframeworks_base-b9be8eff222d9b70079dd53d0d61de229d8d7914.zip
frameworks_base-b9be8eff222d9b70079dd53d0d61de229d8d7914.tar.gz
frameworks_base-b9be8eff222d9b70079dd53d0d61de229d8d7914.tar.bz2
am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'ffc89899652f5c815b6d156f55a909001420891e': Don't pulse LED on new notification unless notification has LED flag set
-rwxr-xr-xservices/java/com/android/server/NotificationManagerService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 5039294..3cf447c 100755
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -767,7 +767,9 @@ public class NotificationManagerService extends INotificationManager.Stub
long identity = Binder.clearCallingIdentity();
try {
r.statusBarKey = mStatusBar.addNotification(n);
- mAttentionLight.pulse();
+ if ((n.notification.flags & Notification.FLAG_SHOW_LIGHTS) != 0) {
+ mAttentionLight.pulse();
+ }
}
finally {
Binder.restoreCallingIdentity(identity);