Fix NPE in ConnectivityService
bug:11727708 Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
This commit is contained in:
@@ -3457,7 +3457,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||||||
synchronized (mProxyLock) {
|
synchronized (mProxyLock) {
|
||||||
if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
|
if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
|
||||||
if (mDefaultProxy == proxy) return; // catches repeated nulls
|
if (mDefaultProxy == proxy) return; // catches repeated nulls
|
||||||
if (!proxy.isValid()) {
|
if (proxy != null && !proxy.isValid()) {
|
||||||
if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString());
|
if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user