From 6867be451879042ccf278c1b6bac5b7a9b8aa0fe Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Thu, 7 Mar 2019 17:48:31 -0800
Subject: [PATCH] Call AbstractRemoteService.finishRequest() on PendingRequest
 timeout.

Otherwise the request will never be removed from
AbstractRemoteService.mUnfinishedRequests. This is in line with the
BasePendingRequest.finish() implementation.

Test: presubmit
Change-Id: I38385d0c73b8bf34483af82d0b5282300fcacd1f
---
 core/java/com/android/internal/infra/AbstractRemoteService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/com/android/internal/infra/AbstractRemoteService.java b/core/java/com/android/internal/infra/AbstractRemoteService.java
index f4c904dc750ed..c73b2bb325910 100644
--- a/core/java/com/android/internal/infra/AbstractRemoteService.java
+++ b/core/java/com/android/internal/infra/AbstractRemoteService.java
@@ -610,6 +610,7 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
                 if (remoteService != null) {
                     // TODO(b/117779333): we should probably ignore it if service is destroyed.
                     Slog.w(mTag, "timed out after " + service.getRemoteRequestMillis() + " ms");
+                    remoteService.finishRequest(this);
                     onTimeout(remoteService);
                 } else {
                     Slog.w(mTag, "timed out (no service)");