am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev

automerge: 90ed95f * commit '90ed95faeddf7ebe71320e3e0e80eb17d374e49c': Fix null handling in proxies.
2014-11-21 10:17:39 +00:00
parent 32b3f2ca36 394a29333e
commit 29c0c3beaa
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/net/IpConfigStore.java
+++ b/services/core/java/com/android/server/net/IpConfigStore.java
@@ -122,8 +122,10 @@ public class IpConfigStore {
                    out.writeUTF(proxyProperties.getHost());
                    out.writeUTF(PROXY_PORT_KEY);
                    out.writeInt(proxyProperties.getPort());
+                    if (exclusionList != null) {
                        out.writeUTF(EXCLUSION_LIST_KEY);
                        out.writeUTF(exclusionList);
+                    }
                    written = true;
                    break;
                case PAC: