diff options
author | Mike Lockwood <lockwood@google.com> | 2012-02-14 13:08:01 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-14 13:08:01 -0800 |
commit | ef9d55a6b004685daefee43b49e833c1030de017 (patch) | |
tree | a54e5b33b7fed066cada28039fdf5d57a3f0f5a0 | |
parent | 286b364c7b2438148fc71f3e99f2495f19f1577f (diff) | |
parent | 8f7cc7af66520e3bd5e59e8eadb6907e3e043661 (diff) | |
download | frameworks_base-ef9d55a6b004685daefee43b49e833c1030de017.zip frameworks_base-ef9d55a6b004685daefee43b49e833c1030de017.tar.gz frameworks_base-ef9d55a6b004685daefee43b49e833c1030de017.tar.bz2 |
am 8f7cc7af: am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '8f7cc7af66520e3bd5e59e8eadb6907e3e043661':
Don't pulse LED on new notification unless notification has LED flag set
-rwxr-xr-x | services/java/com/android/server/NotificationManagerService.java | 4 |
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 34a8a02..b3eceb1 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -768,7 +768,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); |