summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2012-02-14 12:37:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-14 12:37:51 -0800
commit594eba859f0ce6d00127f83b38a93f8996e2735c (patch)
tree0d7cc6cd92261882e9f401c28cc26ef1b3556efc /services/java/com
parent78308ca1b41e5974ca97093c532210bad5617b85 (diff)
parentffc89899652f5c815b6d156f55a909001420891e (diff)
downloadframeworks_base-594eba859f0ce6d00127f83b38a93f8996e2735c.zip
frameworks_base-594eba859f0ce6d00127f83b38a93f8996e2735c.tar.gz
frameworks_base-594eba859f0ce6d00127f83b38a93f8996e2735c.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
Diffstat (limited to 'services/java/com')
-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);