PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bluetooth: remove debug logs guard

Browse Source 
Bug: 329809288
Flag: EXEMPT - log only
Test: mmm packages/apps/Settings
Change-Id: Ia1626aa6904c90729de518102aedbab226a25692
This commit is contained in:
Jakub Rotkiewicz
2024-08-21 09:35:49 +00:00
parent 7723d99684
commit 9534a05eeb
2 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/development/bluetooth/AbstractBluetoothListPreferenceController.java
View File

@@ -43,7 +43,6 @@ public abstract class AbstractBluetoothListPreferenceController
implements Preference.OnPreferenceChangeListener { implements Preference.OnPreferenceChangeListener {
private static final String TAG = "AbstrBtListPrefCtrl"; private static final String TAG = "AbstrBtListPrefCtrl";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
protected static final int DEFAULT_VALUE_INT = 1000; protected static final int DEFAULT_VALUE_INT = 1000;
@@ -74,9 +73,7 @@ public abstract class AbstractBluetoothListPreferenceController
@Override @Override
public boolean onPreferenceChange(@Nullable Preference preference, @NonNull Object newValue) { public boolean onPreferenceChange(@Nullable Preference preference, @NonNull Object newValue) {
if (DEBUG) { Log.d(TAG, "onPreferenceChange: newValue=" + (String) newValue);
Log.d(TAG, "onPreferenceChange: newValue=" + (String) newValue);
}
if (mListPreference == null) { if (mListPreference == null) {
Log.e(TAG, "onPreferenceChange: List preference is null"); Log.e(TAG, "onPreferenceChange: List preference is null");
return false; return false;
@@ -99,9 +96,7 @@ public abstract class AbstractBluetoothListPreferenceController
@Override @Override
protected void onDeveloperOptionsSwitchDisabled() { protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled(); super.onDeveloperOptionsSwitchDisabled();
if (DEBUG) { Log.d(TAG, "onDeveloperOptionsSwitchDisabled");
Log.d(TAG, "onDeveloperOptionsSwitchDisabled");
}
if (mListPreference == null) { if (mListPreference == null) {
Log.e(TAG, "onDeveloperOptionsSwitchDisabled: List preference is null"); Log.e(TAG, "onDeveloperOptionsSwitchDisabled: List preference is null");
return; return;
@@ -230,14 +225,12 @@ public abstract class AbstractBluetoothListPreferenceController
} }
private void setupDefaultListPreference() { private void setupDefaultListPreference() {
if (DEBUG) { Log.d(
Log.d( TAG,
TAG, "setupDefaultListPreference: mDefaultEntry="
"setupDefaultListPreference: mDefaultEntry=" + mDefaultEntry
+ mDefaultEntry + ", mDefaultValue="
+ ", mDefaultValue=" + mDefaultValue);
+ mDefaultValue);
}
if (mListPreference == null) { if (mListPreference == null) {
Log.e(TAG, "setupListPreference: List preference is null"); Log.e(TAG, "setupListPreference: List preference is null");
return; return;

35
src/com/android/settings/development/bluetooth/BluetoothCodecListPreferenceController.java
View File

@@ -43,7 +43,6 @@ public class BluetoothCodecListPreferenceController
private static final String KEY = "bluetooth_audio_codec_settings_list"; private static final String KEY = "bluetooth_audio_codec_settings_list";
private static final String TAG = "BtExtCodecCtr"; private static final String TAG = "BtExtCodecCtr";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@Nullable private final Callback mCallback; @Nullable private final Callback mCallback;
@@ -59,9 +58,7 @@ public class BluetoothCodecListPreferenceController
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
boolean available = Flags.a2dpOffloadCodecExtensibilitySettings(); boolean available = Flags.a2dpOffloadCodecExtensibilitySettings();
if (DEBUG) { Log.d(TAG, "isAvailable: " + available);
Log.d(TAG, "isAvailable: " + available);
}
return available; return available;
} }
@@ -82,9 +79,7 @@ public class BluetoothCodecListPreferenceController
return false; return false;
} }
if (DEBUG) { Log.d(TAG, "onPreferenceChange: newValue=" + (String) newValue);
Log.d(TAG, "onPreferenceChange: newValue=" + (String) newValue);
}
final BluetoothA2dp bluetoothA2dp = mBluetoothA2dp; final BluetoothA2dp bluetoothA2dp = mBluetoothA2dp;
if (bluetoothA2dp == null) { if (bluetoothA2dp == null) {
Log.e(TAG, "onPreferenceChange: bluetoothA2dp is null"); Log.e(TAG, "onPreferenceChange: bluetoothA2dp is null");
@@ -110,9 +105,7 @@ public class BluetoothCodecListPreferenceController
return false; return false;
} }
if (DEBUG) { Log.d(TAG, "onPreferenceChange: setCodecConfigPreference: " + codecConfig.toString());
Log.d(TAG, "onPreferenceChange: setCodecConfigPreference: " + codecConfig.toString());
}
bluetoothA2dp.setCodecConfigPreference(activeDevice, codecConfig); bluetoothA2dp.setCodecConfigPreference(activeDevice, codecConfig);
if (mCallback != null) { if (mCallback != null) {
mCallback.onBluetoothCodecChanged(); mCallback.onBluetoothCodecChanged();
@@ -161,14 +154,12 @@ public class BluetoothCodecListPreferenceController
&& currentCodecConfig.getExtendedCodecType().equals(codecType)) { && currentCodecConfig.getExtendedCodecType().equals(codecType)) {
selectedCodecId = codecIds.get(codecIds.size() - 1); selectedCodecId = codecIds.get(codecIds.size() - 1);
selectedLabel = labels.get(labels.size() - 1); selectedLabel = labels.get(labels.size() - 1);
if (DEBUG) { Log.d(
Log.d( TAG,
TAG, "updateState: Current config: "
"updateState: Current config: " + selectedLabel
+ selectedLabel + ", id: "
+ ", id: " + selectedCodecId);
+ selectedCodecId);
}
} }
} }
@@ -178,9 +169,7 @@ public class BluetoothCodecListPreferenceController
@Override @Override
public void onHDAudioEnabled(boolean enabled) { public void onHDAudioEnabled(boolean enabled) {
if (DEBUG) { Log.d(TAG, "onHDAudioEnabled: enabled=" + enabled);
Log.d(TAG, "onHDAudioEnabled: enabled=" + enabled);
}
if (mListPreference == null) { if (mListPreference == null) {
Log.e(TAG, "onHDAudioEnabled: List preference is null"); Log.e(TAG, "onHDAudioEnabled: List preference is null");
return; return;
@@ -216,9 +205,7 @@ public class BluetoothCodecListPreferenceController
return; return;
} }
if (DEBUG) { Log.d(TAG, "writeConfigurationValues: Selected codec: " + selectedCodecType.toString());
Log.d(TAG, "writeConfigurationValues: Selected codec: " + selectedCodecType.toString());
}
final BluetoothCodecStatus codecStatus = getBluetoothCodecStatus(); final BluetoothCodecStatus codecStatus = getBluetoothCodecStatus();
if (codecStatus == null) { if (codecStatus == null) {
Log.e(TAG, "writeConfigurationValues: Bluetooth Codec Status is null"); Log.e(TAG, "writeConfigurationValues: Bluetooth Codec Status is null");