Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09454b27 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Use createStringArray instead of readStringArray" am: 66cd788d am:... 

Merge "Use createStringArray instead of readStringArray" am: 66cd788d am: 9a1b958e am: d19a5eac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I743f07815b4d2d112d0f8bbeb9d313f6f3d3a8e0
parents 65fd64d4 d19a5eac

core/java/android/net/ProxyInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

            }