Merge "Put NaN checks where it is otherwise not expected" into rvc-dev am:... (4b8e505b) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package com.android.systemui.statusbar.phone;
		import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters;
		import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.ROWS_ALL;

		import static java.lang.Float.isNaN;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		@@ -2009,7 +2011,12 @@ public class NotificationPanelViewController extends PanelViewController {

		@Override
		protected float getOverExpansionAmount() {
		return mNotificationStackScroller.getCurrentOverScrollAmount(true /* top */);
		float result = mNotificationStackScroller.getCurrentOverScrollAmount(true /* top */);
		if (isNaN(result)) {
		Log.wtf(TAG, "OverExpansionAmount is NaN!");
		}

		return result;
		}

		@Override

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.statusbar.phone;

		import static java.lang.Float.isNaN;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		@@ -638,6 +640,9 @@ public abstract class PanelViewController {
		}

		public void setExpandedHeightInternal(float h) {
		if (isNaN(h)) {
		Log.wtf(TAG, "ExpandedHeight set to NaN");
		}
		if (mExpandLatencyTracking && h != 0f) {
		DejankUtils.postAfterTraversal(
		() -> mLatencyTracker.onActionEnd(LatencyTracker.ACTION_EXPAND_PANEL));