Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" into udc-dev am: 3418e6a53d am: ad14d859b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22999945 Change-Id: I5a01ea6075b6de562da5ee90899025d3a8d5d88a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user