diff options
| author | Steven Moreland <smoreland@google.com> | 2021-10-04 20:55:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-04 20:55:08 +0000 |
| commit | e869287a7b65b3405ce1cf08fbd07600c6d772ed (patch) | |
| tree | 37b7739a87dec42b9b49a61fe55230d199d8a443 | |
| parent | 06e16941d5902abe9dd8fa854e18ebfa99c9d3ab (diff) | |
| parent | c861533254d98870599ea83016a9eed9f76ad567 (diff) | |
| download | base-e869287a7b65b3405ce1cf08fbd07600c6d772ed.tar.gz | |
Merge "Parcel: obtain(IBinder) as API"
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/Parcel.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 93ef8f82093c..5c072541f974 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -29976,6 +29976,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 243dfb3e04bc..358aa29eaea6 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -458,8 +458,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) { |