summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api/current.txt1
-rw-r--r--core/java/android/os/Parcel.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index e2167c7b5c13..09f10aa95834 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -31422,6 +31422,7 @@ package android.os {
method public boolean hasFileDescriptors();
method public byte[] marshall();
method @NonNull public static android.os.Parcel obtain();
+ method @NonNull public static android.os.Parcel obtain(@NonNull android.os.IBinder);
method @Nullable public Object[] readArray(@Nullable ClassLoader);
method @Nullable public java.util.ArrayList readArrayList(@Nullable ClassLoader);
method public void readBinderArray(@NonNull android.os.IBinder[]);
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index bd36772064e7..5efa3904e3cb 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -486,8 +486,6 @@ public final class Parcel {
* transaction on this specific binder object. Based on this, the format of the wire binder
* protocol may change. For future compatibility, it is recommended to use this for all
* Parcels.
- *
- * @hide
*/
@NonNull
public static Parcel obtain(@NonNull IBinder binder) {