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

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

Change-Id: If29810233126f050afc9632310af7795042a2427
This commit is contained in:
Winson Chung
2021-09-02 22:58:12 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
}
}