Merge "Don't throw for LazyValue in Parcel.hasFileDescriptors()"

2021-09-06 10:12:59 +00:00
parent f1edc162c4 c087f62482
commit 6ae29f70d7
1 changed files with 2 additions and 1 deletions
--- 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;
    }