Merge "SystemServer: follow-up log fix" into main (13ab066e) · Commits · e / os / android_packages_modules_Bluetooth

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -642,10 +642,8 @@ class BluetoothManagerService {
		Log.d(TAG, "Bluetooth Adapter address changed to " + newAddress);
		storeNameAndAddress(null, newAddress);
		} else {
		if (DBG) {
		Log.e(TAG, "No Bluetooth Adapter address parameter found");
		}
		}
		} else if (Intent.ACTION_SETTING_RESTORED.equals(action)) {
		final String name = intent.getStringExtra(Intent.EXTRA_SETTING_NAME);
		if (Settings.Global.BLUETOOTH_ON.equals(name)) {
		@@ -655,13 +653,11 @@ class BluetoothManagerService {
		final String newValue =
		intent.getStringExtra(Intent.EXTRA_SETTING_NEW_VALUE);

		if (DBG) {
		Log.d(
		TAG,
		"ACTION_SETTING_RESTORED with BLUETOOTH_ON"
		+ (" prevValue=" + prevValue)
		+ (" newValue=" + newValue));
		}

		if ((newValue != null)
		&& (prevValue != null)