Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo"

2023-05-03 18:15:07 +00:00
parent b46adf6c75 22e6d32e71
commit a8be7cf198
1 changed files with 2 additions and 2 deletions
--- 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 =