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

Commit 44aa1bfb 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 

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



Change-Id: Ifb8741eef236555a2d8dec5ae66b1b3d559ec174
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4a70850 336f21d5

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