Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler

Bug: 242344103 Test: m Change-Id: I37fa9c7bb99d1ea1cef1bd42125bf0de7bc0adbd
2022-08-12 14:16:17 -07:00 · 2022-08-12 14:16:17 -07:00 · 7fe4dcfeb8
commit 7fe4dcfeb8
parent ace6c8c76e
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/adb/AdbDebuggingManager.java
+++ b/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())) {