commit e7ecff7cdc6c95c29eebf161a4da4f6009763ea7
author Robert Greenwalt <rgreenwalt@google.com> Mon May 31 06:53:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 31 06:53:21 2021 +0000
tree 6348b053d12f4a05ce7079428a349026965929b8
parent ac3381efa25601c6655ca8f08646d53e232925e7
parent 2b1ac58fdf8c4170b456f64c9d4e888ec0b8a4a9

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

Original change: undetermined

Change-Id: Ie885a39b42ca2d5a2438f6ca705f911986de29af

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 52c7b40..4bdf992 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3428,7 +3428,7 @@
         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;
             }