diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-07-29 10:55:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-29 10:55:58 -0700 |
| commit | f9665221aaa229dc8a7cac6fbd1d9ea165c42068 (patch) | |
| tree | b3a4d430182803915b92b20d082bb92f0980e64d /services/java/com/android/server/ConnectivityService.java | |
| parent | bd176f36ca9ab357cfa6fa330c4955b1a0ef8d35 (diff) | |
| parent | a128f5f8c952d7f519f64882792e832a4e75e2c8 (diff) | |
am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
Fix NPE when going from proxy to no proxy.
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 9a9cc8ffba27..2a724d46c7d3 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -2484,7 +2484,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { synchronized (this) { if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return; if (mDefaultProxy == proxy) return; - if (!TextUtils.isEmpty(proxy.getHost())) { + if (proxy != null && !TextUtils.isEmpty(proxy.getHost())) { mDefaultProxy = proxy; } else { mDefaultProxy = null; |