From a9d6896c83da336a95fb3199412b40d580e9dc01 Mon Sep 17 00:00:00 2001 From: Prameet Shah Date: Fri, 12 Aug 2022 14:16:17 -0700 Subject: Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler Bug: 242344103 Bug: 261526316 Test: m Change-Id: I37fa9c7bb99d1ea1cef1bd42125bf0de7bc0adbd (cherry picked from commit cb6ec60b034d6265cea391a3966ffdc9c72248d5) --- services/core/java/com/android/server/adb/AdbDebuggingManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/adb/AdbDebuggingManager.java b/services/core/java/com/android/server/adb/AdbDebuggingManager.java index 56990eda3e78..cd81b906d878 100644 --- 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())) { -- cgit v1.2.3-59-g8ed1b