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

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

Change-Id: I37134f755645667acd5997556cf50e01b31e4f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-09 10:20:52 +00:00
committed by Automerger Merge Worker

View File

@@ -85,8 +85,8 @@ public final class NfcAntennaInfo implements Parcelable {
this.mDeviceHeight = in.readInt(); this.mDeviceHeight = in.readInt();
this.mDeviceFoldable = in.readByte() != 0; this.mDeviceFoldable = in.readByte() != 0;
this.mAvailableNfcAntennas = new ArrayList<>(); this.mAvailableNfcAntennas = new ArrayList<>();
in.readParcelableList(this.mAvailableNfcAntennas, in.readTypedList(this.mAvailableNfcAntennas,
AvailableNfcAntenna.class.getClassLoader()); AvailableNfcAntenna.CREATOR);
} }
public static final @NonNull Parcelable.Creator<NfcAntennaInfo> CREATOR = public static final @NonNull Parcelable.Creator<NfcAntennaInfo> CREATOR =