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()"

Browse Source
This commit is contained in:
Bernardo Rufino
2021-09-06 10:12:59 +00:00
committed by Gerrit Code Review
parent f1edc162c4 c087f62482
commit 6ae29f70d7
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

@@ -665,7 +665,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) {
@@ -706,6 +705,8 @@ public final class Parcel {
} }
} }
} }
} else {
getValueType(value); // Will throw if value is not supported
} }
return false; return false;
} }