From bd3f5caf5da78280a6f65215361d1a6504ed8892 Mon Sep 17 00:00:00 2001
From: Raphael Kim <raphk@google.com>
Date: Tue, 24 May 2022 18:23:39 +0000
Subject: [PATCH] Move binder death handling logic to
 ServiceConnector#binderDied().

Bug: 233559082
Test: Manually tested by bug reporter
Change-Id: Idb19c135f7a30404c90c3c80427f57c91a9ab320
---
 .../companion/CompanionDeviceServiceConnector.java   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java b/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java
index a6bd48056e12d..46fc8871349b8 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java
@@ -118,13 +118,23 @@ class CompanionDeviceServiceConnector extends ServiceConnector.Impl<ICompanionDe
         }
     }
 
+    // This method is only called when app is force-closed via settings,
+    // but does not handle crashes. Binder death should be handled in #binderDied()
     @Override
     public void onBindingDied(@NonNull ComponentName name) {
-        // IMPORTANT: call super!
+        // IMPORTANT: call super! this will also invoke binderDied()
         super.onBindingDied(name);
 
         if (DEBUG) Log.d(TAG, "onBindingDied() " + mComponentName.toShortString());
+    }
 
+    @Override
+    public void binderDied() {
+        super.binderDied();
+
+        if (DEBUG) Log.d(TAG, "binderDied() " + mComponentName.toShortString());
+
+        // Handle primary process being killed
         if (mListener != null) {
             mListener.onBindingDied(mUserId, mComponentName.getPackageName());
         }