diff options
| author | 2023-05-09 10:32:28 +0000 | |
|---|---|---|
| committer | 2023-05-09 10:32:28 +0000 | |
| commit | 4c5e0eb59ba8d372e1d586695bf35e777b0751e8 (patch) | |
| tree | 256a166501c6535d67b74374c1437e74b9174785 | |
| parent | 1032a5574c54157d3a8d64790f02ca5f672283ad (diff) | |
| parent | ad14d859b3263aebf3b6e6023c4a71308f91093d (diff) | |
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>
| -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 = |