commit 7965ebe42a0ffe198c2345522484824e0c934650
author Daniel Sandler <dsandler@android.com> Sat Jan 16 02:26:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 16 02:26:53 2016 +0000
tree 956f47e2b50578748d8b252a4f83d35bcd4a8025
parent 46736ec81c2a35d450b2c2d86ca3423cd92a225d
parent 8afab95aa976cc1d07ee307df9fa85f505ba800c

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

* commit '8afab95aa976cc1d07ee307df9fa85f505ba800c':
  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 6efb774..ce4eff5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -1954,8 +1954,9 @@
                     + " alertAgain=" + alertAgain);
         }
 
+        final StatusBarNotification oldNotification = entry.notification;
         entry.notification = notification;
-        mGroupManager.onEntryUpdated(entry, entry.notification);
+        mGroupManager.onEntryUpdated(entry, oldNotification);
 
         boolean updateSuccessful = false;
         if (applyInPlace) {