diff options
| author | 2023-05-09 00:52:13 +0000 | |
|---|---|---|
| committer | 2023-05-09 00:52:13 +0000 | |
| commit | 3418e6a53d4ffd33c1d7da11f276ed5cd015d914 (patch) | |
| tree | b9513ca5201c3080795cddd12bf7863da9c538e8 | |
| parent | 5a024a35e9c2efcfedef0cab2870fde8aec62c9e (diff) | |
| parent | e8a15451d488cc04ece92d580b610e9ddc67585b (diff) | |
Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" into udc-dev
| -rw-r--r-- | core/java/android/nfc/NfcAntennaInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/nfc/NfcAntennaInfo.java b/core/java/android/nfc/NfcAntennaInfo.java index d54fcd2ed5b3..b002ca21e8e3 100644 --- a/core/java/android/nfc/NfcAntennaInfo.java +++ b/core/java/android/nfc/NfcAntennaInfo.java @@ -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 = |