Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 450b8a30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move ServiceConnector job timeouts to the job handler thread" am: 336f21d5 am: 44aa1bfb 

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



Change-Id: I512594b93eee10e7ac535b5615796a1dbf81c607
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70949fe8 44aa1bfb

core/java/com/android/internal/infra/ServiceConnector.java

+4 −0
Original line number Diff line number Diff line
@@ -745,6 +745,10 @@ public interface ServiceConnector<I extends IInterface> { 
            boolean mAsync = false;

            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();

                if (requestTimeout > 0) {

                    orTimeout(requestTimeout, TimeUnit.MILLISECONDS);