commit 3be84505f41e58125b4449f0506d518bd2f1ae95
author Daniel Sandler <dsandler@android.com> Fri Jan 15 21:14:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 15 21:14:01 2016 +0000
tree 4e0644b66e0242eecf676afff7eabc0291e70789
parent 33b55366c5138237e3da268a05f08b064426becc
parent 76f28bbd64a6841a91d4890d7a248411fd95b149

Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
am: 76f28bbd64

* commit '76f28bbd64a6841a91d4890d7a248411fd95b149':
  Stop leaking Notifications when they change groupKeys.

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 9ff86eb..f88b233 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 @@
         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) {