Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae29f70 authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Gerrit Code Review
Browse files

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

parents f1edc162 c087f624

core/java/android/os/Parcel.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }