Merge "Call AbstractRemoteService.finishRequest() on PendingRequest timeout."

2019-03-13 18:39:23 +00:00
parent 669024d1b2 6867be4518
commit d5c06b57a2
1 changed files with 1 additions and 0 deletions
--- a/core/java/com/android/internal/infra/AbstractRemoteService.java
+++ b/core/java/com/android/internal/infra/AbstractRemoteService.java
@@ -614,6 +614,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)");