am 3863b8a1: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit '3863b8a1e7951b48178979950cd91eda77ea432f':
  Fix NPE in ConnectivityService
This commit is contained in:
Robert Greenwalt
2013-11-18 10:37:51 -08:00
committed by Android Git Automerger

View File

@@ -3428,7 +3428,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
synchronized (mProxyLock) {
if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
if (mDefaultProxy == proxy) return; // catches repeated nulls
if (!proxy.isValid()) {
if (proxy != null && !proxy.isValid()) {
if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString());
return;
}