Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab0f438 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Fix issue #37470038: API Review: ServiceConnection.onBindingDead()"... 

Merge "Fix issue #37470038: API Review: ServiceConnection.onBindingDead()" into oc-dev am: 232ff0bd
am: 54246d53

Change-Id: Id414ddd56d711cf4f0e383d8e0964add4129eec0
parents 47a67516 54246d53

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9896,7 +9896,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);















  }

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -10470,7 +10470,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);















  }

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -9930,7 +9930,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);















  }

























core/java/android/app/LoadedApk.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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) {

































core/java/android/content/ServiceConnection.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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) {















    }















}