commit 2e794c179f3f0a17ba4a73e6b7a32c13094c99c2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 29 17:54:34 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 29 17:54:34 2023 +0000
tree 9703988e6af10ac01cf563a785e2e5506ac76607
parent 76ed00edf44d48aa4b87917f8cf780e00c5ea53e
parent b884d90e29c838447a805fd721b5ccee40104b14

Merge "Fix NPE" into main

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 62a8cfd..b0f8276 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -763,7 +763,7 @@
      * Sets the amount of vertical over scroll that should be performed on the notifications scrim.
      */
     public void setNotificationsOverScrollAmount(int overScrollAmount) {
-        mNotificationsScrim.setTranslationY(overScrollAmount);
+        if (mNotificationsScrim != null) mNotificationsScrim.setTranslationY(overScrollAmount);
     }
 
     /**