am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
* commit 'ffc050ad369c09d740d33f72e66d03f6e2473c49': Track active notifications by key, not by reference.
This commit is contained in:
Chris Wren
@@ -201,8 +201,8 @@ public class NotificationManagerService extends SystemService {
|
||||
|
||||
private boolean mDisableNotificationEffects;
|
||||
private int mCallState;
|
||||
NotificationRecord mSoundNotification;
|
||||
NotificationRecord mVibrateNotification;
|
||||
private String mSoundNotificationKey;
|
||||
private String mVibrateNotificationKey;
|
||||
|
||||
private final ArraySet<ManagedServiceInfo> mListenersDisablingEffects = new ArraySet<>();
|
||||
private ComponentName mEffectsSuppressor;
|
||||
@@ -222,8 +222,8 @@ public class NotificationManagerService extends SystemService {
|
||||
final ArrayList<ToastRecord> mToastQueue = new ArrayList<ToastRecord>();
|
||||
final ArrayMap<String, NotificationRecord> mSummaryByGroupKey = new ArrayMap<>();
|
||||
|
||||
ArrayList<String> mLights = new ArrayList<String>();
|
||||
NotificationRecord mLedNotification;
|
||||
// The last key in this list owns the hardware.
|
||||
ArrayList<String> mLights = new ArrayList<>();
|
||||
|
||||
private AppOpsManager mAppOps;
|
||||
|
||||
@@ -595,7 +595,7 @@ public class NotificationManagerService extends SystemService {
|
||||
if (DBG) Slog.d(TAG, "clearEffects");
|
||||
|
||||
// sound
|
||||
mSoundNotification = null;
|
||||
mSoundNotificationKey = null;
|
||||
|
||||
long identity = Binder.clearCallingIdentity();
|
||||
try {
|
||||
@@ -609,7 +609,7 @@ public class NotificationManagerService extends SystemService {
|
||||
}
|
||||
|
||||
// vibrate
|
||||
mVibrateNotification = null;
|
||||
mVibrateNotificationKey = null;
|
||||
identity = Binder.clearCallingIdentity();
|
||||
try {
|
||||
mVibrator.cancel();
|
||||
@@ -619,7 +619,6 @@ public class NotificationManagerService extends SystemService {
|
||||
|
||||
// light
|
||||
mLights.clear();
|
||||
mLedNotification = null;
|
||||
updateLightsLocked();
|
||||
}
|
||||
}
|
||||
@@ -1624,14 +1623,19 @@ public class NotificationManagerService extends SystemService {
|
||||
if (N > 0) {
|
||||
pw.println(" Lights List:");
|
||||
for (int i=0; i<N; i++) {
|
||||
pw.println(" " + mLights.get(i));
|
||||
if (i == N - 1) {
|
||||
pw.print(" > ");
|
||||
} else {
|
||||
pw.print(" ");
|
||||
}
|
||||
pw.println(mLights.get(i));
|
||||
}
|
||||
pw.println(" ");
|
||||
}
|
||||
pw.println(" mUseAttentionLight=" + mUseAttentionLight);
|
||||
pw.println(" mNotificationPulseEnabled=" + mNotificationPulseEnabled);
|
||||
pw.println(" mSoundNotification=" + mSoundNotification);
|
||||
pw.println(" mVibrateNotification=" + mVibrateNotification);
|
||||
pw.println(" mSoundNotificationKey=" + mSoundNotificationKey);
|
||||
pw.println(" mVibrateNotificationKey=" + mVibrateNotificationKey);
|
||||
pw.println(" mDisableNotificationEffects=" + mDisableNotificationEffects);
|
||||
pw.println(" mCallState=" + callStateToString(mCallState));
|
||||
pw.println(" mSystemReady=" + mSystemReady);
|
||||
@@ -2058,7 +2062,7 @@ public class NotificationManagerService extends SystemService {
|
||||
boolean looping =
|
||||
(notification.flags & Notification.FLAG_INSISTENT) != 0;
|
||||
AudioAttributes audioAttributes = audioAttributesForNotification(notification);
|
||||
mSoundNotification = record;
|
||||
mSoundNotificationKey = record.getKey();
|
||||
// do not play notifications if stream volume is 0 (typically because
|
||||
// ringer mode is silent) or if there is a user of exclusive audio focus
|
||||
if ((mAudioManager.getStreamVolume(
|
||||
@@ -2101,7 +2105,7 @@ public class NotificationManagerService extends SystemService {
|
||||
if ((useDefaultVibrate || convertSoundToVibration || hasCustomVibrate)
|
||||
&& !(mAudioManager.getRingerModeInternal()
|
||||
== AudioManager.RINGER_MODE_SILENT)) {
|
||||
mVibrateNotification = record;
|
||||
mVibrateNotificationKey = record.getKey();
|
||||
|
||||
if (useDefaultVibrate || convertSoundToVibration) {
|
||||
// Escalate privileges so we can use the vibrator even if the
|
||||
@@ -2132,9 +2136,6 @@ public class NotificationManagerService extends SystemService {
|
||||
// light
|
||||
// release the light
|
||||
boolean wasShowLights = mLights.remove(record.getKey());
|
||||
if (mLedNotification != null && record.getKey().equals(mLedNotification.getKey())) {
|
||||
mLedNotification = null;
|
||||
}
|
||||
if ((notification.flags & Notification.FLAG_SHOW_LIGHTS) != 0 && aboveThreshold) {
|
||||
mLights.add(record.getKey());
|
||||
updateLightsLocked();
|
||||
@@ -2458,9 +2459,11 @@ public class NotificationManagerService extends SystemService {
|
||||
mListeners.notifyRemovedLocked(r.sbn);
|
||||
}
|
||||
|
||||
final String canceledKey = r.getKey();
|
||||
|
||||
// sound
|
||||
if (mSoundNotification == r) {
|
||||
mSoundNotification = null;
|
||||
if (canceledKey.equals(mSoundNotificationKey)) {
|
||||
mSoundNotificationKey = null;
|
||||
final long identity = Binder.clearCallingIdentity();
|
||||
try {
|
||||
final IRingtonePlayer player = mAudioManager.getRingtonePlayer();
|
||||
@@ -2474,8 +2477,8 @@ public class NotificationManagerService extends SystemService {
|
||||
}
|
||||
|
||||
// vibrate
|
||||
if (mVibrateNotification == r) {
|
||||
mVibrateNotification = null;
|
||||
if (canceledKey.equals(mVibrateNotificationKey)) {
|
||||
mVibrateNotificationKey = null;
|
||||
long identity = Binder.clearCallingIdentity();
|
||||
try {
|
||||
mVibrator.cancel();
|
||||
@@ -2486,10 +2489,7 @@ public class NotificationManagerService extends SystemService {
|
||||
}
|
||||
|
||||
// light
|
||||
mLights.remove(r.getKey());
|
||||
if (mLedNotification == r) {
|
||||
mLedNotification = null;
|
||||
}
|
||||
mLights.remove(canceledKey);
|
||||
|
||||
// Record usage stats
|
||||
switch (reason) {
|
||||
@@ -2521,7 +2521,7 @@ public class NotificationManagerService extends SystemService {
|
||||
// Save it for users of getHistoricalNotifications()
|
||||
mArchive.record(r.sbn);
|
||||
|
||||
EventLogTags.writeNotificationCanceled(r.getKey(), reason);
|
||||
EventLogTags.writeNotificationCanceled(canceledKey, reason);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2727,20 +2727,22 @@ public class NotificationManagerService extends SystemService {
|
||||
void updateLightsLocked()
|
||||
{
|
||||
// handle notification lights
|
||||
if (mLedNotification == null) {
|
||||
// get next notification, if any
|
||||
int n = mLights.size();
|
||||
if (n > 0) {
|
||||
mLedNotification = mNotificationsByKey.get(mLights.get(n-1));
|
||||
NotificationRecord ledNotification = null;
|
||||
while (ledNotification == null && !mLights.isEmpty()) {
|
||||
final String owner = mLights.get(mLights.size() - 1);
|
||||
ledNotification = mNotificationsByKey.get(owner);
|
||||
if (ledNotification == null) {
|
||||
Slog.wtfStack(TAG, "LED Notification does not exist: " + owner);
|
||||
mLights.remove(owner);
|
||||
}
|
||||
}
|
||||
|
||||
// Don't flash while we are in a call or screen is on
|
||||
if (mLedNotification == null || mInCall || mScreenOn) {
|
||||
if (ledNotification == null || mInCall || mScreenOn) {
|
||||
mNotificationLight.turnOff();
|
||||
mStatusBar.notificationLightOff();
|
||||
} else {
|
||||
final Notification ledno = mLedNotification.sbn.getNotification();
|
||||
final Notification ledno = ledNotification.sbn.getNotification();
|
||||
int ledARGB = ledno.ledARGB;
|
||||
int ledOnMS = ledno.ledOnMS;
|
||||
int ledOffMS = ledno.ledOffMS;
|
||||
|
||||
Reference in New Issue
Block a user