summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Lin <lucaslin@google.com> 2021-01-28 04:31:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-28 04:31:18 +0000
commit9a1b958e67b562df040664b12bf48aa2cfa45ca3 (patch)
treeed1a2ff0c42fccdc302387389ed14f76fb59d7e4
parentb82753716ef07fe23322440b730d9397f06f9f1b (diff)
parent66cd788d4e6b1f0318798be53fbbda8d6d54074d (diff)
Merge "Use createStringArray instead of readStringArray" am: 66cd788d4e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I38445a56180675c48055fc4256ea238c2b86fabe
-rw-r--r--core/java/android/net/ProxyInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java
index a202d77a211a..c9bca2876b0a 100644
--- a/core/java/android/net/ProxyInfo.java
+++ b/core/java/android/net/ProxyInfo.java
@@ -355,7 +355,7 @@ public class ProxyInfo implements Parcelable {
port = in.readInt();
}
String exclList = in.readString();
- String[] parsedExclList = in.readStringArray();
+ String[] parsedExclList = in.createStringArray();
ProxyInfo proxyProperties = new ProxyInfo(host, port, exclList, parsedExclList);
return proxyProperties;
}