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

Commit 66c85134 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 51213d94: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 

* commit '51213d94':
  Fix NPE in ConnectivityService
parents c94ef471 51213d94

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

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

            }