Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: bf01004156

Change-Id: I5adfafbef5059f58b28c271f43caeadc5560b162
This commit is contained in:
Jeff Chang
2019-06-26 02:06:23 -07:00
committed by android-build-merger
parent 565e15ee9c bf01004156
commit afd1585881
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -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