Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" into tm-qpr-dev

2022-12-07 23:37:10 +00:00
parent 9507b44655 a9d6896c83
commit 382b7c8be1
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())) {