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"

Browse Source
This commit is contained in:
Prameet Shah
2022-09-07 00:17:24 +00:00
committed by Gerrit Code Review
parent 2e933599ed 7fe4dcfeb8
commit 9946834795
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())) {