Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e16e1d1 authored by Jeff Chang's avatar Jeff Chang Committed by android-build-merger
Browse files

Merge "Fix a potential crash when calculate system gesture exclusion" into qt-dev am: bf010041 

am: aca08c14

Change-Id: I6923766eb3cf5973bccc9385b6962ebd5bcfea8b
parents 83ef1697 aca08c14

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

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




                    @Override

                    @Override

                    public void onSwipeFromRight() {

                    public void onSwipeFromRight() {

                        final Region excludedRegion =

                        final Region excludedRegion;

                                mDisplayContent.calculateSystemGestureExclusion();

                        synchronized (mLock) {

                            excludedRegion = mDisplayContent.calculateSystemGestureExclusion();

                        }

                        final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture

                        final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture

                                || mNavigationBarPosition == NAV_BAR_RIGHT;

                                || mNavigationBarPosition == NAV_BAR_RIGHT;

                        if (mNavigationBar != null && sideAllowed

                        if (mNavigationBar != null && sideAllowed
@@ -490,8 +492,10 @@ public class DisplayPolicy { 




                    @Override

                    @Override

                    public void onSwipeFromLeft() {

                    public void onSwipeFromLeft() {

                        final Region excludedRegion =

                        final Region excludedRegion;

                                mDisplayContent.calculateSystemGestureExclusion();

                        synchronized (mLock) {

                            excludedRegion = mDisplayContent.calculateSystemGestureExclusion();

                        }

                        final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture

                        final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture

                                || mNavigationBarPosition == NAV_BAR_LEFT;

                                || mNavigationBarPosition == NAV_BAR_LEFT;

                        if (mNavigationBar != null && sideAllowed

                        if (mNavigationBar != null && sideAllowed