Skip to content
Snippets Groups Projects
Commit cc293928 authored by Chris Li's avatar Chris Li
Browse files

Catch RejectedExecutionException for DisplayChanged from WM

Fix: 339385595
Test: atest FrameworksCoreTests:ClientTransactionListenerControllerTest
Merged-In: I5620ed93c1395a7c39654ec254c11e31081d10a7
Change-Id: I5620ed93c1395a7c39654ec254c11e31081d10a7
parent 5aabbae3
No related branches found
No related tags found
No related merge requests found
......@@ -23,9 +23,12 @@ import static java.util.Objects.requireNonNull;
import android.annotation.NonNull;
import android.app.ActivityThread;
import android.hardware.display.DisplayManagerGlobal;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import java.util.concurrent.RejectedExecutionException;
/**
* Singleton controller to manage listeners to individual {@link ClientTransaction}.
*
......@@ -33,6 +36,8 @@ import com.android.internal.annotations.VisibleForTesting;
*/
public class ClientTransactionListenerController {
private static final String TAG = "ClientTransactionListenerController";
private static ClientTransactionListenerController sController;
private final DisplayManagerGlobal mDisplayManager;
......@@ -73,6 +78,10 @@ public class ClientTransactionListenerController {
// Not enable for system server.
return;
}
mDisplayManager.handleDisplayChangeFromWindowManager(displayId);
try {
mDisplayManager.handleDisplayChangeFromWindowManager(displayId);
} catch (RejectedExecutionException e) {
Log.w(TAG, "Failed to notify DisplayListener because the Handler is shutting down");
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment