diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java index 13990325d98..23ba4f66379 100644 --- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java @@ -70,9 +70,8 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater boolean isFilterMatched = false; if (isDeviceConnected(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice)) { - if (DBG) { - Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile); - } + Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile); + // If device is Hearing Aid, it is compatible with HFP and A2DP. // It would show in Available Devices group. if (cachedDevice.isConnectedAshaHearingAidDevice()) { @@ -111,14 +110,12 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater isFilterMatched = cachedDevice.isConnectedHfpDevice(); break; } - if (DBG) { - Log.d( - TAG, - "isFilterMatched() device : " - + cachedDevice.getName() - + ", isFilterMatched : " - + isFilterMatched); - } + Log.d( + TAG, + "isFilterMatched() device : " + + cachedDevice.getName() + + ", isFilterMatched : " + + isFilterMatched); } return isFilterMatched; } diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index 59aa4186431..4b21b2ecfb0 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -183,10 +183,8 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback, @Override public void onAclConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { - if (DBG) { - Log.d(getLogTag(), "onAclConnectionStateChanged() device: " + cachedDevice.getName() - + ", state: " + state); - } + Log.d(getLogTag(), "onAclConnectionStateChanged() device: " + cachedDevice.getName() + + ", state: " + state); update(cachedDevice); } diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java index 43bc4f38d26..bfd4221ea52 100644 --- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java @@ -38,7 +38,6 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater implements Preference.OnPreferenceClickListener { private static final String TAG = "SavedBluetoothDeviceUpdater"; - private static final boolean DBG = Log.isLoggable(BluetoothDeviceUpdater.TAG, Log.DEBUG); private static final String PREF_KEY = "saved_bt"; @@ -100,11 +99,9 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater @Override public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) { final BluetoothDevice device = cachedDevice.getDevice(); - if (DBG) { - Log.d(TAG, "isFilterMatched() device name : " + cachedDevice.getName() + - ", is connected : " + device.isConnected() + ", is profile connected : " - + cachedDevice.isConnected()); - } + Log.d(TAG, "isFilterMatched() device name : " + cachedDevice.getName() + + ", is connected : " + device.isConnected() + ", is profile connected : " + + cachedDevice.isConnected()); return device.getBondState() == BluetoothDevice.BOND_BONDED && (mShowConnectedDevice || (!device.isConnected() && isDeviceInCachedDevicesList( cachedDevice)));