Merge "Move binder death handling logic to ServiceConnector#binderDied()." into tm-dev am: 0bdc2763a9 am: 836e158dbe

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

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

services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java

@@ -119,13 +119,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());
         }