From e8a15451d488cc04ece92d580b610e9ddc67585b Mon Sep 17 00:00:00 2001
From: Alisher Alikhodjaev <alisher@google.com>
Date: Tue, 2 May 2023 15:09:58 -0700
Subject: 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
---
 core/java/android/nfc/NfcAntennaInfo.java | 4 ++--
 1 file 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 =
-- 
cgit v1.2.3-59-g8ed1b