diff options
| author | 2022-09-07 02:20:30 +0000 | |
|---|---|---|
| committer | 2022-09-07 02:20:30 +0000 | |
| commit | 833fb8b820abe3bd18bbec2c2fcf368ac0a6636b (patch) | |
| tree | 488f41a525174699032158b94de84e555fa27d1f | |
| parent | e442860cea8dea1facd162d3655b7b9889d249c1 (diff) | |
| parent | 2d15671d29d5a4980f06c2b8ce4fcf70cfc75a5a (diff) | |
Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am: 9946834795 am: a4c70add80 am: b157ddb8cd am: c14b86f979 am: 2d15671d29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189719
Change-Id: I7c3ca4ff2ed8f083b161438f964985ec62361780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 2eaf323ea370..04bd869cd566 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())) { |