From 0b7566676bc84dd2ffbc1f546d43fd25130218d3 Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Thu, 3 Mar 2022 15:54:19 +0800 Subject: [PATCH] Add empty addTransactionCommittedListener for StubTransaction To avoid calling real method which may run the listener on a dead handler which was terminated by test. That crashes the test process. (TransitionTests#testFixedRotationOpen uses the stub transaction to onRotationTransactionReady -> addTransactionCommittedListener) Bug: 221223435 Test: atest TransitionTests Change-Id: Ie967814cebf8f33563184c6a98ed4e670e7a8056 --- .../src/com/android/server/wm/StubTransaction.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java index cac948c97b254..46ef7ed092dee 100644 --- a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java +++ b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java @@ -28,6 +28,8 @@ import android.view.InputWindowHandle; import android.view.Surface; import android.view.SurfaceControl; +import java.util.concurrent.Executor; + /** * Stubbed {@link android.view.SurfaceControl.Transaction} class that can be used when unit * testing to avoid calls to native code. @@ -218,6 +220,12 @@ public class StubTransaction extends SurfaceControl.Transaction { return this; } + @Override + public SurfaceControl.Transaction addTransactionCommittedListener(Executor executor, + SurfaceControl.TransactionCommittedListener listener) { + return this; + } + @Override public SurfaceControl.Transaction syncInputWindows() { return this;