Merge "Fix a potential crash when calculate system gesture exclusion" (c1fa92bf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayPolicy.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -478,8 +478,10 @@ public class DisplayPolicy {

		@Override
		public void onSwipeFromRight() {
		final Region excludedRegion =
		mDisplayContent.calculateSystemGestureExclusion();
		final Region excludedRegion;
		synchronized (mLock) {
		excludedRegion = mDisplayContent.calculateSystemGestureExclusion();
		}
		final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture
		\|\| mNavigationBarPosition == NAV_BAR_RIGHT;
		if (mNavigationBar != null && sideAllowed
		@@ -490,8 +492,10 @@ public class DisplayPolicy {

		@Override
		public void onSwipeFromLeft() {
		final Region excludedRegion =
		mDisplayContent.calculateSystemGestureExclusion();
		final Region excludedRegion;
		synchronized (mLock) {
		excludedRegion = mDisplayContent.calculateSystemGestureExclusion();
		}
		final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture
		\|\| mNavigationBarPosition == NAV_BAR_LEFT;
		if (mNavigationBar != null && sideAllowed