Fix crash when proxy exclusion list is null.
Also cleaned up source a little bit and eliminated a warning.
Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java
index ba27221..17d0ec0 100644
--- a/core/java/android/net/ProxyProperties.java
+++ b/core/java/android/net/ProxyProperties.java
@@ -41,13 +41,17 @@
if (source != null) {
mProxy = source.getAddress();
mPort = source.getPort();
- mExclusionList = new String(source.getExclusionList());
+ String exclusionList = source.getExclusionList();
+ if (exclusionList != null) {
+ mExclusionList = new String(exclusionList);
+ }
}
}
public InetAddress getAddress() {
return mProxy;
}
+
public void setAddress(InetAddress proxy) {
mProxy = proxy;
}
@@ -55,6 +59,7 @@
public int getPort() {
return mPort;
}
+
public void setPort(int port) {
mPort = port;
}
@@ -62,6 +67,7 @@
public String getExclusionList() {
return mExclusionList;
}
+
public void setExclusionList(String exclusionList) {
mExclusionList = exclusionList;
}
@@ -121,5 +127,4 @@
return new ProxyProperties[size];
}
};
-
-};
+}