am 6668bcdc: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev am: 2b1ac58fdf

Original change: undetermined

Change-Id: Ie885a39b42ca2d5a2438f6ca705f911986de29af
This commit is contained in:
Robert Greenwalt
2021-05-31 06:53:21 +00:00
committed by Automerger Merge Worker

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;
}