Merge "Fixes NPE in NSSL.getTopOrSectionTop()." (90c7d215) · Commits · e / os / android_frameworks_base

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -2227,15 +2227,18 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		int top = 0;
		if (section != null) {
		ActivatableNotificationView firstView = section.getFirstVisibleChild();
		if (firstView != null) {
		// Round Y up to avoid seeing the background during animation
		int finalTranslationY = (int) Math.ceil(ViewState.getFinalTranslationY(firstView));
		if (alreadyAnimating \|\| section.isTargetTop(finalTranslationY)) {
		// we're ending up at the same location as we are now, let's just skip the animation
		// we're ending up at the same location as we are now, let's just skip the
		// animation
		top = finalTranslationY;
		} else {
		top = (int) Math.ceil(firstView.getTranslationY());
		}
		}
		}
		return top;
		}