| commit | a9090b57cfb3d890f42d72bc64cdb03b48d4dc7a | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Thu Jan 28 04:31:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 28 04:31:18 2021 +0000 |
| tree | 0acca643bcbd0e18ed2d082ca897a98569de865e | |
| parent | b96b07febed26c41725c72825f392e4c925dc5f3 [diff] | |
| parent | d1a04ba095268ca40f23b7ca69e3ceb61734fed7 [diff] |
Merge "Use createStringArray instead of readStringArray" am: d1a04ba095 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I38445a56180675c48055fc4256ea238c2b86fabe
diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java index a202d77..c9bca28 100644 --- a/core/java/android/net/ProxyInfo.java +++ b/core/java/android/net/ProxyInfo.java
@@ -355,7 +355,7 @@ 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; }