diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java index c466a8ce6d3f4..7b704e23f5e8a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java @@ -384,7 +384,7 @@ public abstract class PanelViewController { protected void startExpandMotion(float newX, float newY, boolean startTracking, float expandedHeight) { - if (!mHandlingPointerUp) { + if (!mHandlingPointerUp && !mStatusBarStateController.isDozing()) { beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE); } mInitialOffsetOnTouch = expandedHeight; @@ -655,7 +655,9 @@ public abstract class PanelViewController { @Override public void onAnimationStart(Animator animation) { - beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE); + if (!mStatusBarStateController.isDozing()) { + beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE); + } } @Override