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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15744883

Change-Id: I02807d6969769b4b2224ffe015ac25ed0ab98bbd
This commit is contained in:
Winson Chung
2021-09-02 22:43:23 +00:00
committed by Automerger Merge Worker

View File

@@ -384,7 +384,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
private void onNavigationSettingsChanged() { private void onNavigationSettingsChanged() {
boolean wasBackAllowed = isHandlingGestures(); boolean wasBackAllowed = isHandlingGestures();
updateCurrentUserResources(); updateCurrentUserResources();
if (wasBackAllowed != isHandlingGestures()) { if (mStateChangeCallback != null && wasBackAllowed != isHandlingGestures()) {
mStateChangeCallback.run(); mStateChangeCallback.run();
} }
} }