diff options
| author | Bernardo Rufino <brufino@google.com> | 2021-09-06 10:31:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-06 10:31:57 +0000 |
| commit | 82a0a22b30bc377785fb7d5511ca5ad34429fdf0 (patch) | |
| tree | c5c304a8b4b2ac78d62a056f447e0092d04a5547 /core/java/android | |
| parent | 019af988097e53280abb0674273910d6a0f2c947 (diff) | |
| parent | 6ae29f70d7d5915e8d6b0411fb5075ca2b7b6fb0 (diff) | |
Merge "Don't throw for LazyValue in Parcel.hasFileDescriptors()" am: 6ae29f70d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818898
Change-Id: Ie6cb56a29e544e50803144a4ac533c29f35d6c06
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Parcel.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index c42c1d9dcd15..f132ac54b58c 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -695,7 +695,6 @@ public final class Parcel { * @hide */ public static boolean hasFileDescriptors(Object value) { - getValueType(value); // Will throw if value is not supported if (value instanceof LazyValue) { return ((LazyValue) value).hasFileDescriptors(); } else if (value instanceof Parcelable) { @@ -736,6 +735,8 @@ public final class Parcel { } } } + } else { + getValueType(value); // Will throw if value is not supported } return false; } |