LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8a2ac41d: am 29c0c3be: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f

Browse Source 
* commit '8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
  Fix null handling in proxies.
This commit is contained in:
Geoffrey Borggaard
2014-11-21 10:31:03 +00:00
committed by Android Git Automerger
parent 710c6e775b 29c0c3beaa
commit fb978eb150
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/net/IpConfigStore.java
View File

@@ -122,8 +122,10 @@ public class IpConfigStore {
out.writeUTF(proxyProperties.getHost()); out.writeUTF(proxyProperties.getHost());
out.writeUTF(PROXY_PORT_KEY); out.writeUTF(PROXY_PORT_KEY);
out.writeInt(proxyProperties.getPort()); out.writeInt(proxyProperties.getPort());
if (exclusionList != null) {
out.writeUTF(EXCLUSION_LIST_KEY); out.writeUTF(EXCLUSION_LIST_KEY);
out.writeUTF(exclusionList); out.writeUTF(exclusionList);
}
written = true; written = true;
break; break;
case PAC: case PAC: