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

Commit 82a0a22b 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 

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

Change-Id: Ie6cb56a29e544e50803144a4ac533c29f35d6c06
parents 019af988 6ae29f70

core/java/android/os/Parcel.java

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

    }