Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am: 9946834795

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189719

Change-Id: I597b5fd2c4e6752e90dc2335a113d0bc32d14fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Prameet Shah
2022-09-07 00:42:40 +00:00
committed by Automerger Merge Worker
parent 8bbef5de9a 9946834795
commit a4c70add80
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/adb/AdbDebuggingManager.java
View File

@@ -667,6 +667,7 @@ public class AdbDebuggingManager {
+ " Not enabling adbwifi."); + " Not enabling adbwifi.");
Settings.Global.putInt(mContentResolver, Settings.Global.putInt(mContentResolver,
Settings.Global.ADB_WIFI_ENABLED, 0); Settings.Global.ADB_WIFI_ENABLED, 0);
return;
} }
// Check for network change // Check for network change
@@ -675,6 +676,7 @@ public class AdbDebuggingManager {
Slog.e(TAG, "Unable to get the wifi ap's BSSID. Disabling adbwifi."); Slog.e(TAG, "Unable to get the wifi ap's BSSID. Disabling adbwifi.");
Settings.Global.putInt(mContentResolver, Settings.Global.putInt(mContentResolver,
Settings.Global.ADB_WIFI_ENABLED, 0); Settings.Global.ADB_WIFI_ENABLED, 0);
return;
} }
synchronized (mAdbConnectionInfo) { synchronized (mAdbConnectionInfo) {
if (!bssid.equals(mAdbConnectionInfo.getBSSID())) { if (!bssid.equals(mAdbConnectionInfo.getBSSID())) {