Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af433337 authored May 10, 2016 by Selim Cinek Committed by android-build-merger May 10, 2016

Merge "Fixed a memory leak with notification children" into nyc-dev

am: 9688c2ed

* commit '9688c2ed':
  Fixed a memory leak with notification children

Change-Id: I41ea616cf23f37c3cd818552f2431c69f464b426

parents ed4e2d1c 9688c2ed

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1544,6 +1544,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
	}		}
	for (int i = 0; i < toRemove.size(); i++) {		for (int i = 0; i < toRemove.size(); i++) {
	removeNotification(toRemove.get(i).getStatusBarNotification().getKey(), ranking);		removeNotification(toRemove.get(i).getStatusBarNotification().getKey(), ranking);
			// we need to ensure that the view is actually properly removed from the viewstate
			// as this won't happen anymore when kept in the parent.
			mStackScroller.removeViewStateForView(toRemove.get(i));
	}		}
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3589,6 +3589,15 @@ public class NotificationStackScrollLayout extends ViewGroup
	setFadedOut(alpha != 1.0f);		setFadedOut(alpha != 1.0f);
	}		}

			/**
			* Remove the a given view from the viewstate. This is currently used when the children are
			* kept in the parent artificially to have a nicer animation.
			* @param view the view to remove
			*/
			public void removeViewStateForView(View view) {
			mCurrentStackScrollState.removeViewStateForView(view);
			}

	/**		/**
	* A listener that is notified when some child locations might have changed.		* A listener that is notified when some child locations might have changed.
	*/		*/