Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am: 9946834795 am: a4c70add80 am: b157ddb8cd am: c14b86f979

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189719

Change-Id: I602f5afb15e46ed7a22e2011c6d12a68920e1643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/adb/AdbDebuggingManager.java

@@ -667,6 +667,7 @@ public class AdbDebuggingManager {
                                     + " Not enabling adbwifi.");
                             Settings.Global.putInt(mContentResolver,
                                     Settings.Global.ADB_WIFI_ENABLED, 0);
+                            return;
                         }
 
                         // Check for network change
@@ -675,6 +676,7 @@ public class AdbDebuggingManager {
                             Slog.e(TAG, "Unable to get the wifi ap's BSSID. Disabling adbwifi.");
                             Settings.Global.putInt(mContentResolver,
                                     Settings.Global.ADB_WIFI_ENABLED, 0);
+                            return;
                         }
                         synchronized (mAdbConnectionInfo) {
                             if (!bssid.equals(mAdbConnectionInfo.getBSSID())) {