From 817b5e12f987fc5356bb023bb62bbcc8c06b8d9f Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Thu, 7 Mar 2019 14:32:56 -0800
Subject: [PATCH] Don't destroy service when the bind connection died.

Otherwise it won't reconnect...

Bug: 126807984
Test: manual verification

Change-Id: I54c7fc244672d38f387f786ea13a7ffb54aca44b
---
 .../com/android/internal/infra/AbstractRemoteService.java   | 5 +++++
 .../server/contentcapture/ContentCapturePerUserService.java | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/infra/AbstractRemoteService.java b/core/java/com/android/internal/infra/AbstractRemoteService.java
index f4c904dc750ed..7270302f04bb2 100644
--- a/core/java/com/android/internal/infra/AbstractRemoteService.java
+++ b/core/java/com/android/internal/infra/AbstractRemoteService.java
@@ -480,6 +480,11 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
         return mDestroyed;
     }
 
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[" + mComponentName + "]";
+    }
+
     /**
      * Base class for the requests serviced by the remote service.
      *
diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
index 9185cb6c53468..4c21b4fbadd76 100644
--- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
+++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
@@ -175,10 +175,8 @@ final class ContentCapturePerUserService
 
     @Override // from ContentCaptureServiceCallbacks
     public void onServiceDied(@NonNull RemoteContentCaptureService service) {
-        if (mMaster.debug) Slog.d(TAG, "remote service died: " + service);
-        synchronized (mLock) {
-            removeSelfFromCacheLocked();
-        }
+        // Don't do anything; eventually the system will bind to it again...
+        Slog.w(TAG, "remote service died: " + service);
     }
 
     // TODO(b/119613670): log metrics