commit a8be7cf198e63cb39828a6f46ac3da2f64bb9150
author Alisher Alikhodjaev <alisher@google.com> Wed May 03 18:15:07 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 03 18:15:07 2023 +0000
tree 1ce192d7c941c5c2ddacaa58e2795f03cfdf7159
parent b46adf6c7548456b3eb5b4464b13ecd672a27db1
parent 22e6d32e7134518360d08ccc0e67aa73fcc2f443

Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo"

core/java/android/nfc/NfcAntennaInfo.java

diff --git a/core/java/android/nfc/NfcAntennaInfo.java b/core/java/android/nfc/NfcAntennaInfo.java
index d54fcd2..b002ca2 100644
--- a/core/java/android/nfc/NfcAntennaInfo.java
+++ b/core/java/android/nfc/NfcAntennaInfo.java
@@ -85,8 +85,8 @@
         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 =