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

Commit 6d0059f7 authored by Olivier Gaillard's avatar Olivier Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Add @Nullable and @NonNull to onTransactStarted"

parents a5211154 5a73a512

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5187,7 +5187,7 @@ package android.os { 














  public static interface Binder.ProxyTransactListener {















    method public void onTransactEnded(@Nullable Object);













    method public Object onTransactStarted(android.os.IBinder, int);













    method @Nullable public Object onTransactStarted(@NonNull android.os.IBinder, int);















  }





























  public class BugreportManager {

































core/java/android/os/Binder.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -653,7 +653,8 @@ public class Binder implements IBinder {













         *















         * @return an object that will be passed back to #onTransactEnded (or null).















         */













        Object onTransactStarted(IBinder binder, int transactionCode);













        @Nullable













        Object onTransactStarted(@NonNull IBinder binder, int transactionCode);































        /**















         * Called after onTranact (even when an exception is thrown).