Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e568672c authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in ConnectivityService" into klp-dev

parents 9570ed56 a8dae99d

services/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -3457,7 +3457,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;

            }