summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alisher Alikhodjaev <alisher@google.com> 2023-05-02 15:09:58 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2023-05-03 20:42:28 +0000
commite8a15451d488cc04ece92d580b610e9ddc67585b (patch)
tree01a0c928b311efb4d0e5e283a3976f06842751e7
parent0edc2428dd50581c0326895b2ca2c92adf8d92cd (diff)
NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo
Bug: 279870988 Test: TBD (cherry picked from https://android-review.googlesource.com/q/commit:22e6d32e7134518360d08ccc0e67aa73fcc2f443) Merged-In: I12fe668d10ab5ddc1fb2fe1420d44a063b0a3df5 Change-Id: I12fe668d10ab5ddc1fb2fe1420d44a063b0a3df5
-rw-r--r--core/java/android/nfc/NfcAntennaInfo.java4
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 =