summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/os/Parcel.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 575eb375abc6..00db972bf709 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -665,7 +665,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) {
@@ -706,6 +705,8 @@ public final class Parcel {
}
}
}
+ } else {
+ getValueType(value); // Will throw if value is not supported
}
return false;
}