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

Commit 47d0d2bb authored by Alisher Alikhodjaev's avatar Alisher Alikhodjaev Committed by Automerger Merge Worker
Browse files

Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" am:... 

Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" am: a8be7cf1 am: 1b2a313f

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



Change-Id: Ib8d7eb10fe29c2bd1ff91f26bf81b932053997e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f38d32b5 1b2a313f

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 =