Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" (99468347) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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())) {