commit 6d0059f79c03a2b63bb61d25b5a573500d2a9e8a
author Olivier Gaillard <gaillard@google.com> Mon Mar 11 09:51:18 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 11 09:51:18 2019 +0000
tree a0414c0e4077ed37e569b2748d450969260a5b73
parent a52111547a9886561663561b0074bd07d7617262
parent 5a73a5123cd8e7b62b48c6dd3f1d730879a77826

Merge "Add @Nullable and @NonNull to onTransactStarted"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 0f1ab29..4d340a2 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5187,7 +5187,7 @@
 
   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

diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index b28c2f4..d5ef249 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -653,7 +653,8 @@
          *
          * @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).