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

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

Change-Id: I03b92476dc2741931353bcc8bb5ffc261c65589b

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;
     }