summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2016-01-15 21:18:20 +0000
committer android-build-merger <android-build-merger@google.com> 2016-01-15 21:18:20 +0000
commit8afab95aa976cc1d07ee307df9fa85f505ba800c (patch)
treeb0616735d5c0b525a1615049df37c6a29edba9ec
parent2edfa8c9b00cd0c0bd18738f75e0928394b99c76 (diff)
parent3be84505f41e58125b4449f0506d518bd2f1ae95 (diff)
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev am: 76f28bbd64
am: 3be84505f4 * commit '3be84505f41e58125b4449f0506d518bd2f1ae95': Stop leaking Notifications when they change groupKeys.
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 9ff86ebf88aa..f88b2339838c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -1914,8 +1914,9 @@ public abstract class BaseStatusBar extends SystemUI implements
boolean shouldInterrupt = shouldInterrupt(entry, notification);
boolean alertAgain = alertAgain(entry, n);
+ final StatusBarNotification oldNotification = entry.notification;
entry.notification = notification;
- mGroupManager.onEntryUpdated(entry, entry.notification);
+ mGroupManager.onEntryUpdated(entry, oldNotification);
boolean updateSuccessful = false;
if (applyInPlace) {