summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alisher Alikhodjaev <alisher@google.com> 2023-05-03 18:15:07 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-05-03 18:15:07 +0000
commita8be7cf198e63cb39828a6f46ac3da2f64bb9150 (patch)
tree1ce192d7c941c5c2ddacaa58e2795f03cfdf7159
parentb46adf6c7548456b3eb5b4464b13ecd672a27db1 (diff)
parent22e6d32e7134518360d08ccc0e67aa73fcc2f443 (diff)
Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo"
-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 =