Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev

Browse Source 
* commit '1b26cc5b7ab5733b94741f17c84eb4b140eaf045':
  LED should not be blocked by interruption filtering.
This commit is contained in:
Chris Wren
2014-11-24 20:00:55 +00:00
committed by Android Git Automerger
parent f00d46db37 1b26cc5b7a
commit fa5768cef4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -1869,8 +1869,8 @@ public class NotificationManagerService extends SystemService {
final Notification notification = record.sbn.getNotification(); final Notification notification = record.sbn.getNotification();
// Should this notification make noise, vibe, or use the LED? // Should this notification make noise, vibe, or use the LED?
final boolean canInterrupt = (record.score >= SCORE_INTERRUPTION_THRESHOLD) && final boolean aboveThreshold = record.score >= SCORE_INTERRUPTION_THRESHOLD;
!record.isIntercepted(); final boolean canInterrupt = aboveThreshold && !record.isIntercepted();
if (DBG || record.isIntercepted()) if (DBG || record.isIntercepted())
Slog.v(TAG, Slog.v(TAG,
"pkg=" + record.sbn.getPackageName() + " canInterrupt=" + canInterrupt + "pkg=" + record.sbn.getPackageName() + " canInterrupt=" + canInterrupt +
@@ -2009,7 +2009,7 @@ public class NotificationManagerService extends SystemService {
if (mLedNotification != null && record.getKey().equals(mLedNotification.getKey())) { if (mLedNotification != null && record.getKey().equals(mLedNotification.getKey())) {
mLedNotification = null; mLedNotification = null;
} }
if ((notification.flags & Notification.FLAG_SHOW_LIGHTS) != 0 && canInterrupt) { if ((notification.flags & Notification.FLAG_SHOW_LIGHTS) != 0 && aboveThreshold) {
mLights.add(record.getKey()); mLights.add(record.getKey());
updateLightsLocked(); updateLightsLocked();
if (mUseAttentionLight) { if (mUseAttentionLight) {