Merge "Fixed a crash when the heads up content view was null" into nyc-dev (841e4946) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -834,11 +834,15 @@ public class NotificationContentView extends FrameLayout {
		public void updateExpandButtons(boolean expandable) {
		mExpandable = expandable;
		// if the expanded child has the same height as the collapsed one we hide it.
		if (mExpandedChild != null && mExpandedChild.getHeight() != 0 &&
		((mIsHeadsUp && mExpandedChild.getHeight() == mHeadsUpChild.getHeight()) \|\|
		(!mIsHeadsUp && mExpandedChild.getHeight() == mContractedChild.getHeight()))) {
		if (mExpandedChild != null && mExpandedChild.getHeight() != 0) {
		if ((!mIsHeadsUp \|\| mHeadsUpChild == null)) {
		if (mExpandedChild.getHeight() == mContractedChild.getHeight()) {
		expandable = false;
		}
		} else if (mExpandedChild.getHeight() == mHeadsUpChild.getHeight()) {
		expandable = false;
		}
		}
		if (mExpandedChild != null) {
		mExpandedWrapper.updateExpandability(expandable, mExpandClickListener);
		}