commit 63c22e6a581b73b238786293a814eed16df1d58a
author Chen Xu <fionaxu@google.com> Sat Dec 14 06:58:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 14 06:58:09 2019 +0000
tree f4b61526fee60c96f5d5ddb35b72146593ed2de6
parent a1e84ee2c728c8080be6ae0a78c7e8d3b1829353
parent 3eb183ec5dae0d85e543d8a99f4d18753caa2e27

Merge "replace hidden API: Parcel.readStringArray"

src/java/com/android/internal/telephony/uicc/AdnRecord.java

diff --git a/src/java/com/android/internal/telephony/uicc/AdnRecord.java b/src/java/com/android/internal/telephony/uicc/AdnRecord.java
index 7aa6a11..2e21297 100644
--- a/src/java/com/android/internal/telephony/uicc/AdnRecord.java
+++ b/src/java/com/android/internal/telephony/uicc/AdnRecord.java
@@ -93,9 +93,14 @@
             recordNumber = source.readInt();
             alphaTag = source.readString();
             number = source.readString();
-            emails = source.readStringArray();
-
-            return new AdnRecord(efid, recordNumber, alphaTag, number, emails);
+            final int len = source.readInt();
+            if (len > 0) {
+                emails = new String[len];
+                source.readStringArray(emails);
+                return new AdnRecord(efid, recordNumber, alphaTag, number, emails);
+            } else {
+                return new AdnRecord(efid, recordNumber, alphaTag, number, null);
+            }
         }
 
         @Override