diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-07-29 10:53:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-29 10:53:16 -0700 |
| commit | a128f5f8c952d7f519f64882792e832a4e75e2c8 (patch) | |
| tree | fcd83ee6912b63fd156fb5e47a49eca804e4e205 | |
| parent | 86574d66dacc09c9b5a0a0ab2623ec01704b6fc8 (diff) | |
| parent | 1a230885b356256e91b3bf006ec72213ba6f8f76 (diff) | |
| download | frameworks_base-a128f5f8c952d7f519f64882792e832a4e75e2c8.zip frameworks_base-a128f5f8c952d7f519f64882792e832a4e75e2c8.tar.gz frameworks_base-a128f5f8c952d7f519f64882792e832a4e75e2c8.tar.bz2 | |
am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
Fix NPE when going from proxy to no proxy.
| -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 2f6bbec..2733fd3 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -2300,7 +2300,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; |