From 5c5f45325cfc96054e6f3b575b5474c9a9059b83 Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@google.com>
Date: Thu, 9 Dec 2021 12:45:11 -0800
Subject: [PATCH] Make binderDied(IBinder who) public API

Expose the binderDied() variant that supplies the IBinder that has
become invalid.

Bug: 207163286
CTS-Coverage-Bug: 214327236
Test: atest BinderDeathDispatcherTest
Change-Id: I7193e29287dcc5c2a6447514c84840eca8adf61f
---
 core/api/current.txt              | 1 +
 core/java/android/os/IBinder.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index e4fc9f3a57d15..3d98c6d80e5af 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -30067,6 +30067,7 @@ package android.os {
 
   public static interface IBinder.DeathRecipient {
     method public void binderDied();
+    method public default void binderDied(@NonNull android.os.IBinder);
   }
 
   public interface IInterface {
diff --git a/core/java/android/os/IBinder.java b/core/java/android/os/IBinder.java
index 9e47a708162de..90e4b17250d81 100644
--- a/core/java/android/os/IBinder.java
+++ b/core/java/android/os/IBinder.java
@@ -311,9 +311,11 @@ public interface IBinder {
         public void binderDied();
 
         /**
-         * @hide
+         * Interface for receiving a callback when the process hosting an IBinder
+         * has gone away.
+         * @param who The IBinder that has become invalid
          */
-        default void binderDied(IBinder who) {
+        default void binderDied(@NonNull IBinder who) {
             binderDied();
         }
     }