Merge "Fix NPE in edge back gesture handler" into sc-v2-dev

2021-09-02 22:30:18 +00:00
parent a51f3de478 8ad79ffd15
commit ef3d227783
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -384,7 +384,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
    private void onNavigationSettingsChanged() {
        boolean wasBackAllowed = isHandlingGestures();
        updateCurrentUserResources();
-        if (wasBackAllowed != isHandlingGestures()) {
+        if (mStateChangeCallback != null && wasBackAllowed != isHandlingGestures()) {
            mStateChangeCallback.run();
        }
    }