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

Merge "Fix crash coming from accessing invalid display from GestureDetector" into rvc-dev

Browse Source
This commit is contained in:
Keun-young Park
2020-05-29 01:50:54 +00:00
committed by Android (Google) Code Review
parent 49d38d8b08 84798da0fe
commit 0b4de9e604
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java
View File

@@ -25,6 +25,7 @@ import android.os.SystemClock;
import android.util.Slog; import android.util.Slog;
import android.view.Display; import android.view.Display;
import android.view.DisplayCutout; import android.view.DisplayCutout;
import android.view.DisplayInfo;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.InputDevice; import android.view.InputDevice;
import android.view.MotionEvent; import android.view.MotionEvent;
@@ -117,8 +118,17 @@ class SystemGesturesPointerEventListener implements PointerEventListener {
// GestureDetector would get a ViewConfiguration instance by context, that may also // GestureDetector would get a ViewConfiguration instance by context, that may also
// create a new WindowManagerImpl for the new display, and lock WindowManagerGlobal // create a new WindowManagerImpl for the new display, and lock WindowManagerGlobal
// temporarily in the constructor that would make a deadlock. // temporarily in the constructor that would make a deadlock.
mHandler.post(() -> mGestureDetector = mHandler.post(() -> {
new GestureDetector(mContext, new FlingGestureDetector(), mHandler) {}); final int displayId = mContext.getDisplayId();
final DisplayInfo info = DisplayManagerGlobal.getInstance().getDisplayInfo(displayId);
if (info == null) {
// Display already removed, stop here.
Slog.w(TAG, "Cannot create GestureDetector, display removed:" + displayId);
return;
}
mGestureDetector = new GestureDetector(mContext, new FlingGestureDetector(), mHandler) {
};
});
} }
@Override @Override