Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't throw for LazyValue in Parcel.hasFileDescriptors()" am: 6ae29f70d7 am: 82a0a22b30

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818898

Change-Id: I05b8551287b14d62a983082ad11a751ae8de8f71
This commit is contained in:
Bernardo Rufino
2021-09-06 10:44:07 +00:00
committed by Automerger Merge Worker
parent 26c0c5c1b6 82a0a22b30
commit 25cb1f4df7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/Parcel.java
View File

@@ -695,7 +695,6 @@ public final class Parcel {
* @hide * @hide
*/ */
public static boolean hasFileDescriptors(Object value) { public static boolean hasFileDescriptors(Object value) {
getValueType(value); // Will throw if value is not supported
if (value instanceof LazyValue) { if (value instanceof LazyValue) {
return ((LazyValue) value).hasFileDescriptors(); return ((LazyValue) value).hasFileDescriptors();
} else if (value instanceof Parcelable) { } 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; return false;
} }