am 6668bcdc: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit '6668bcdc88226c2f36f5ba4084661477e0e517c4': Fix NPE in ConnectivityService
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user