Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-23 00:44:47 +00:00
committed by Android (Google) Code Review

View File

@@ -472,7 +472,10 @@ public class CarStatusBar extends StatusBar implements
} }
boolean isTracking = mIsTracking; boolean isTracking = mIsTracking;
Rect rect = mNotificationList.getClipBounds(); Rect rect = mNotificationList.getClipBounds();
float clippedHeight = rect.bottom; float clippedHeight = 0;
if (rect != null) {
clippedHeight = rect.bottom;
}
if (!handled && event.getActionMasked() == MotionEvent.ACTION_UP if (!handled && event.getActionMasked() == MotionEvent.ACTION_UP
&& mIsSwipingVerticallyToClose) { && mIsSwipingVerticallyToClose) {
if (mSettleClosePercentage < mPercentageFromBottom && isTracking) { if (mSettleClosePercentage < mPercentageFromBottom && isTracking) {