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

Commit ad14d859 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" into udc-dev am: 3418e6a5 

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



Change-Id: I37134f755645667acd5997556cf50e01b31e4f14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf784bdf 3418e6a5

core/java/android/nfc/NfcAntennaInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ public final class NfcAntennaInfo implements Parcelable { 
        this.mDeviceHeight = in.readInt();

        this.mDeviceFoldable = in.readByte() != 0;

        this.mAvailableNfcAntennas = new ArrayList<>();

        in.readParcelableList(this.mAvailableNfcAntennas,

                AvailableNfcAntenna.class.getClassLoader());

        in.readTypedList(this.mAvailableNfcAntennas,

                AvailableNfcAntenna.CREATOR);

    }



    public static final @NonNull Parcelable.Creator<NfcAntennaInfo> CREATOR =