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

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

Change-Id: I512594b93eee10e7ac535b5615796a1dbf81c607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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