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

Merge "Move ServiceConnector job timeouts to the job handler thread" am: 336f21d53d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2629381

Change-Id: Ifb8741eef236555a2d8dec5ae66b1b3d559ec174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-26 15:25:20 +00:00
committed by Automerger Merge Worker
parent b4a708506a 336f21d53d
commit 44aa1bfb36
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/infra/ServiceConnector.java
View File

@@ -745,6 +745,10 @@ public interface ServiceConnector<I extends IInterface> {
boolean mAsync = false; boolean mAsync = false;
private String mDebugName; private String mDebugName;
{ {
// The timeout handler must be set before any calls to set timeouts on the
// AndroidFuture, to ensure they are posted on the proper thread.
setTimeoutHandler(getJobHandler());
long requestTimeout = getRequestTimeoutMs(); long requestTimeout = getRequestTimeoutMs();
if (requestTimeout > 0) { if (requestTimeout > 0) {
orTimeout(requestTimeout, TimeUnit.MILLISECONDS); orTimeout(requestTimeout, TimeUnit.MILLISECONDS);