diff options
| author | 2014-05-09 17:11:14 +0000 | |
|---|---|---|
| committer | 2014-05-09 17:11:15 +0000 | |
| commit | c241db85c937102714e4cb125c97c79f80bebbec (patch) | |
| tree | 37f43718098001e9f77c9c7651be26e7dc25a6a5 | |
| parent | 2509be2bb7f00d615e7e8770c713a36fcf8b9ee1 (diff) | |
| parent | 5df281a570555ee132a12a4aac9aec96e8618270 (diff) | |
Merge "Fix badness from proxy refactoring."
| -rw-r--r-- | core/java/android/net/Proxy.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index 8f41e8561876..daf0065d1c47 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -278,7 +278,9 @@ public final class Proxy { host = p.getHost(); port = Integer.toString(p.getPort()); exclList = p.getExclusionListAsString(); - pacFileUrl = p.getPacFileUrl().toString(); + if (p.getPacFileUrl() != null) { + pacFileUrl = p.getPacFileUrl().toString(); + } } setHttpProxySystemProperty(host, port, exclList, pacFileUrl); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 09e7e12140a7..9f6dd0b24c2a 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -1327,12 +1327,14 @@ public final class ActivityManagerService extends ActivityManagerNative String host = ""; String port = ""; String exclList = ""; - String pacFileUrl = null; + String pacFileUrl = ""; if (proxy != null) { host = proxy.getHost(); port = Integer.toString(proxy.getPort()); exclList = proxy.getExclusionListAsString(); - pacFileUrl = proxy.getPacFileUrl().toString(); + if (proxy.getPacFileUrl() != null) { + pacFileUrl = proxy.getPacFileUrl().toString(); + } } synchronized (ActivityManagerService.this) { for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) { |