From b4cc139e86505288cfdd9fcb9dec5f3b229dd882 Mon Sep 17 00:00:00 2001
From: Shawn Lee <syeonlee@google.com>
Date: Tue, 18 Apr 2023 12:28:14 -0700
Subject: [PATCH] Prevent setOverScrollAmount being called on null QSFragment

Bug: 278608024
Test: added test
Change-Id: I3d921e3f70f9ccc59859a387d4326db6f75b6952
---
 .../com/android/systemui/shade/QuickSettingsController.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
index ef14d1cb7f63d..628d1dfa7163f 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
@@ -875,7 +875,9 @@ public class QuickSettingsController {
     }
 
     void setOverScrollAmount(int overExpansion) {
-        mQs.setOverScrollAmount(overExpansion);
+        if (mQs != null) {
+            mQs.setOverScrollAmount(overExpansion);
+        }
     }
 
     private void setOverScrolling(boolean overscrolling) {