Merge "Remove bluetooth address from logs in SettingsLib" (4ad4ca07) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -292,18 +292,12 @@ public class BluetoothEventManager {
		CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
		if (cachedDevice == null) {
		cachedDevice = mDeviceManager.addDevice(device);
		Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice: "
		+ cachedDevice);
		Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice");
		} else if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED
		&& !cachedDevice.getDevice().isConnected()) {
		// Dispatch device add callback to show bonded but
		// not connected devices in discovery mode
		dispatchDeviceAdded(cachedDevice);
		Log.d(TAG, "DeviceFoundHandler found bonded and not connected device:"
		+ cachedDevice);
		} else {
		Log.d(TAG, "DeviceFoundHandler found existing CachedBluetoothDevice:"
		+ cachedDevice);
		}
		cachedDevice.setRssi(rssi);
		cachedDevice.setJustDiscovered(true);

+3 −6

Original line number	Diff line number	Diff line
		@@ -122,8 +122,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>

		void onProfileStateChanged(LocalBluetoothProfile profile, int newProfileState) {
		if (BluetoothUtils.D) {
		Log.d(TAG, "onProfileStateChanged: profile " + profile + ", device=" + mDevice
		+ ", newProfileState " + newProfileState);
		Log.d(TAG, "onProfileStateChanged: profile " + profile + ", device "
		+ mDevice.getAlias() + ", newProfileState " + newProfileState);
		}
		if (mLocalAdapter.getState() == BluetoothAdapter.STATE_TURNING_OFF)
		{
		@@ -214,9 +214,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		}

		public void setHiSyncId(long id) {
		if (BluetoothUtils.D) {
		Log.d(TAG, "setHiSyncId: mDevice " + mDevice + ", id " + id);
		}
		mHiSyncId = id;
		}

		@@ -562,7 +559,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		}

		if (BluetoothUtils.D) {
		Log.e(TAG, "updating profiles for " + mDevice.getAlias() + ", " + mDevice);
		Log.d(TAG, "updating profiles for " + mDevice.getAlias());
		BluetoothClass bluetoothClass = mDevice.getBluetoothClass();

		if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());