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

Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb am: 2918f0ef46

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

Change-Id: I3ef3df5cb8c99c97770ced51a7c8e0dff5f629a7
This commit is contained in:
Treehugger Robot
2020-08-13 03:44:13 +00:00
committed by Automerger Merge Worker
parent 7949fea1f9 2918f0ef46
commit 0e9d68e890
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
View File

@@ -298,18 +298,12 @@ public class BluetoothEventManager {
CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device); CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
if (cachedDevice == null) { if (cachedDevice == null) {
cachedDevice = mDeviceManager.addDevice(device); cachedDevice = mDeviceManager.addDevice(device);
Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice: " Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice");
+ cachedDevice);
} else if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED } else if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED
&& !cachedDevice.getDevice().isConnected()) { && !cachedDevice.getDevice().isConnected()) {
// Dispatch device add callback to show bonded but // Dispatch device add callback to show bonded but
// not connected devices in discovery mode // not connected devices in discovery mode
dispatchDeviceAdded(cachedDevice); 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.setRssi(rssi);
cachedDevice.setJustDiscovered(true); cachedDevice.setJustDiscovered(true);

9
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -151,8 +151,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
void onProfileStateChanged(LocalBluetoothProfile profile, int newProfileState) { void onProfileStateChanged(LocalBluetoothProfile profile, int newProfileState) {
if (BluetoothUtils.D) { if (BluetoothUtils.D) {
Log.d(TAG, "onProfileStateChanged: profile " + profile + ", device=" + mDevice Log.d(TAG, "onProfileStateChanged: profile " + profile + ", device "
+ ", newProfileState " + newProfileState); + mDevice.getAlias() + ", newProfileState " + newProfileState);
} }
if (mLocalAdapter.getState() == BluetoothAdapter.STATE_TURNING_OFF) if (mLocalAdapter.getState() == BluetoothAdapter.STATE_TURNING_OFF)
{ {
@@ -290,9 +290,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
} }
public void setHiSyncId(long id) { public void setHiSyncId(long id) {
if (BluetoothUtils.D) {
Log.d(TAG, "setHiSyncId: mDevice " + mDevice + ", id " + id);
}
mHiSyncId = id; mHiSyncId = id;
} }
@@ -638,7 +635,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
} }
if (BluetoothUtils.D) { if (BluetoothUtils.D) {
Log.e(TAG, "updating profiles for " + mDevice.getAlias() + ", " + mDevice); Log.d(TAG, "updating profiles for " + mDevice.getAlias());
BluetoothClass bluetoothClass = mDevice.getBluetoothClass(); BluetoothClass bluetoothClass = mDevice.getBluetoothClass();
if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString()); if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());