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

Fix NPE in letterbox double tap

Browse Source 
We check the Letterbox surrfaces are in a valid state before invoking
the double tap callback. We also put the callback invocation under the
WindowManagerService GlobalLock.

Fixes: 294185001
Test: Run `atest WmTests:LetterboxTest`

Change-Id: I076e0b62b3567145f1185e29a29411f53bdf5b90
This commit is contained in:
Massimo Carli
2023-08-11 16:29:53 +00:00
parent 22bc371686
commit 999525ebb1
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/wm/Letterbox.java
View File

@@ -20,7 +20,6 @@ import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS;
import static android.view.SurfaceControl.HIDDEN;
import static android.window.TaskConstants.TASK_CHILD_LAYER_LETTERBOX_BACKGROUND;
import android.content.Context;
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.Rect;
@@ -256,11 +255,11 @@ public class Letterbox {
private final GestureDetector mDoubleTapDetector;
private final DoubleTapListener mDoubleTapListener;
TapEventReceiver(InputChannel inputChannel, Context context) {
TapEventReceiver(InputChannel inputChannel, WindowManagerService wmService) {
super(inputChannel, UiThread.getHandler().getLooper());
mDoubleTapListener = new DoubleTapListener();
mDoubleTapListener = new DoubleTapListener(wmService);
mDoubleTapDetector = new GestureDetector(
context, mDoubleTapListener, UiThread.getHandler());
wmService.mContext, mDoubleTapListener, UiThread.getHandler());
}
@Override
@@ -271,14 +270,24 @@ public class Letterbox {
}
private class DoubleTapListener extends GestureDetector.SimpleOnGestureListener {
private final WindowManagerService mWmService;
private DoubleTapListener(WindowManagerService wmService) {
mWmService = wmService;
}
@Override
public boolean onDoubleTapEvent(MotionEvent e) {
if (e.getAction() == MotionEvent.ACTION_UP) {
mDoubleTapCallbackX.accept((int) e.getRawX());
mDoubleTapCallbackY.accept((int) e.getRawY());
return true;
synchronized (mWmService.mGlobalLock) {
// This check prevents late events to be handled in case the Letterbox has been
// already destroyed and so mOuter.isEmpty() is true.
if (!mOuter.isEmpty() && e.getAction() == MotionEvent.ACTION_UP) {
mDoubleTapCallbackX.accept((int) e.getRawX());
mDoubleTapCallbackY.accept((int) e.getRawY());
return true;
}
return false;
}
return false;
}
}
@@ -294,7 +303,7 @@ public class Letterbox {
mWmService = win.mWmService;
final String name = namePrefix + (win.mActivityRecord != null ? win.mActivityRecord : win);
mClientChannel = mWmService.mInputManager.createInputChannel(name);
mInputEventReceiver = new TapEventReceiver(mClientChannel, mWmService.mContext);
mInputEventReceiver = new TapEventReceiver(mClientChannel, mWmService);
mToken = mClientChannel.getToken();