Merge "Prevent setOverScrollAmount being called on null QSFragment" into udc-dev

2023-04-28 09:05:26 +00:00
parent 4af8abb397 b4cc139e86
commit 42632b339d
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
@@ -887,7 +887,9 @@ public class QuickSettingsController {
    }

    void setOverScrollAmount(int overExpansion) {
-        mQs.setOverScrollAmount(overExpansion);
+        if (mQs != null) {
+            mQs.setOverScrollAmount(overExpansion);
+        }
    }

    private void setOverScrolling(boolean overscrolling) {