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

Commit 25cb1f4d authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

Merge "Don't throw for LazyValue in Parcel.hasFileDescriptors()" am: 6ae29f70 am: 82a0a22b 

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

Change-Id: I05b8551287b14d62a983082ad11a751ae8de8f71
parents 26c0c5c1 82a0a22b

core/java/android/os/Parcel.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -695,7 +695,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) {
@@ -736,6 +735,8 @@ public final class Parcel { 
                    }

                    }

                }

                }

            }

            }

        } else {

            getValueType(value); // Will throw if value is not supported

        }

        }

        return false;

        return false;

    }

    }