Merge "Add null check on NPVC" into sc-dev am: 271c600617 am: 2bf128ac52

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14900429 Change-Id: Ibf4358c0fffb46cfbf2c6d9c509ae25f5fd66864
2021-06-10 13:48:07 +00:00
parent fbc204b5e7 2bf128ac52
commit 08b226b2f9
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2542,7 +2542,9 @@ public class NotificationPanelViewController extends PanelViewController {
                break;
            case FLING_HIDE:
            default:
-                mQs.closeDetail();
+                if (mQs != null) {
+                    mQs.closeDetail();
+                }
                target = 0;
        }
        if (target == mQsExpansionHeight) {