diff options
| author | Steven Moreland <smoreland@google.com> | 2021-10-04 21:14:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-04 21:14:21 +0000 |
| commit | 9a7bbf93672d2a2d9d12d8b5acbd47a329bcbda8 (patch) | |
| tree | 92c540cfaa6136949bba2bd30b8a6c65340ffa29 | |
| parent | 44bfae1759939e03970b70ec942ab2d3e44a1982 (diff) | |
| parent | e869287a7b65b3405ce1cf08fbd07600c6d772ed (diff) | |
| download | base-9a7bbf93672d2a2d9d12d8b5acbd47a329bcbda8.tar.gz | |
Merge "Parcel: obtain(IBinder) as API" am: e869287a7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1817684
Change-Id: I2655c1c2b74b0501912fa4e90f5655db682b2932
| -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 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) { |