diff options
| author | 2022-09-07 00:17:24 +0000 | |
|---|---|---|
| committer | 2022-09-07 00:17:24 +0000 | |
| commit | 99468347952b526b5acf9579492b090b8c352d4f (patch) | |
| tree | ca57daa57e01cb02b41933d43b7d53b81293a5dd | |
| parent | 2e933599ed7eb8842bf2d51edd845819cdd0af84 (diff) | |
| parent | 7fe4dcfeb8c4df389f213ab71a5ebab127e83e0d (diff) | |
Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler"
| -rw-r--r-- | services/core/java/com/android/server/adb/AdbDebuggingManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
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())) { |