From ac2653499692880571922ff63a9dd0ecc2d742a1 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 19 Apr 2017 14:53:18 -0700
Subject: [PATCH] Fix issue #37470038: API Review:
 ServiceConnection.onBindingDead()

Renamed.

Test: booted and ran.

Change-Id: Ic21f7ef66d43fb6db9f7ebbc833f28c09474ea59
---
 api/current.txt                                  | 2 +-
 api/system-current.txt                           | 2 +-
 api/test-current.txt                             | 2 +-
 core/java/android/app/LoadedApk.java             | 2 +-
 core/java/android/content/ServiceConnection.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index d3184d6e109a3..f124ede0f0322 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9892,7 +9892,7 @@ package android.content {
   }
 
   public abstract interface ServiceConnection {
-    method public default void onBindingDead(android.content.ComponentName);
+    method public default void onBindingDied(android.content.ComponentName);
     method public abstract void onServiceConnected(android.content.ComponentName, android.os.IBinder);
     method public abstract void onServiceDisconnected(android.content.ComponentName);
   }
diff --git a/api/system-current.txt b/api/system-current.txt
index b2168327a786a..5aa76f0211743 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -10466,7 +10466,7 @@ package android.content {
   }
 
   public abstract interface ServiceConnection {
-    method public default void onBindingDead(android.content.ComponentName);
+    method public default void onBindingDied(android.content.ComponentName);
     method public abstract void onServiceConnected(android.content.ComponentName, android.os.IBinder);
     method public abstract void onServiceDisconnected(android.content.ComponentName);
   }
diff --git a/api/test-current.txt b/api/test-current.txt
index e3292f9b1bbc7..2a9b9da3ad520 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -9926,7 +9926,7 @@ package android.content {
   }
 
   public abstract interface ServiceConnection {
-    method public default void onBindingDead(android.content.ComponentName);
+    method public default void onBindingDied(android.content.ComponentName);
     method public abstract void onServiceConnected(android.content.ComponentName, android.os.IBinder);
     method public abstract void onServiceDisconnected(android.content.ComponentName);
   }
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index 4205db098ef6b..bbcf7ba591286 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -1598,7 +1598,7 @@ public final class LoadedApk {
                 mConnection.onServiceDisconnected(name);
             }
             if (dead) {
-                mConnection.onBindingDead(name);
+                mConnection.onBindingDied(name);
             }
             // If there is a new service, it is now connected.
             if (service != null) {
diff --git a/core/java/android/content/ServiceConnection.java b/core/java/android/content/ServiceConnection.java
index 8e428f9e9b3d0..6ff4900212ffc 100644
--- a/core/java/android/content/ServiceConnection.java
+++ b/core/java/android/content/ServiceConnection.java
@@ -61,6 +61,6 @@ public interface ServiceConnection {
      * @param name The concrete component name of the service whose
      * connection is dead.
      */
-    default void onBindingDead(ComponentName name) {
+    default void onBindingDied(ComponentName name) {
     }
 }