summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-12-02 23:50:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-12-02 23:50:25 +0000
commitb820ccef451007476050901c2257c10e5d43ba95 (patch)
treead94d4fda290ce06746a5a99f6d58728a39a9cc2
parentf5adc32daabbd7322741dd3e5a3283d5d7ae6a92 (diff)
parente40025cc0b3be257993b883b833afa8db6256c65 (diff)
Merge "Add wtf log if notification panel height is NaN"
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
index 9c70d52d4076..84eacdc41841 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2038,8 +2038,8 @@ public class NotificationPanelViewController extends PanelViewController {
maxHeight = calculatePanelHeightShade();
}
maxHeight = Math.max(min, maxHeight);
- if (maxHeight == 0) {
- Log.wtf(TAG, "maxPanelHeight is 0. getOverExpansionAmount(): "
+ if (maxHeight == 0 || isNaN(maxHeight)) {
+ Log.wtf(TAG, "maxPanelHeight is invalid. getOverExpansionAmount(): "
+ getOverExpansionAmount() + ", calculatePanelHeightQsExpanded: "
+ calculatePanelHeightQsExpanded() + ", calculatePanelHeightShade: "
+ calculatePanelHeightShade() + ", mStatusBarMinHeight = "