Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab1a9a73 authored by Jakub Rotkiewicz (xWF)'s avatar Jakub Rotkiewicz (xWF) Committed by Automerger Merge Worker
Browse files

Merge "bluetooth: remove debug logs guard" into main am: 8b780a83 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3241340



Change-Id: Ied02c723be359d7d2873313a05ea9d6c178cd5e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8863ca7 8b780a83

src/com/android/settings/development/bluetooth/AbstractBluetoothListPreferenceController.java

+8 −15
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ public abstract class AbstractBluetoothListPreferenceController 
        implements Preference.OnPreferenceChangeListener {



    private static final String TAG = "AbstrBtListPrefCtrl";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    protected static final int DEFAULT_VALUE_INT = 1000;
@@ -74,9 +73,7 @@ public abstract class AbstractBluetoothListPreferenceController 


    @Override

    public boolean onPreferenceChange(@Nullable Preference preference, @NonNull Object newValue) {

        if (DEBUG) {

        Log.d(TAG, "onPreferenceChange: newValue=" + (String) newValue);

        }

        if (mListPreference == null) {

            Log.e(TAG, "onPreferenceChange: List preference is null");

            return false;
@@ -99,9 +96,7 @@ public abstract class AbstractBluetoothListPreferenceController 
    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        super.onDeveloperOptionsSwitchDisabled();

        if (DEBUG) {

        Log.d(TAG, "onDeveloperOptionsSwitchDisabled");

        }

        if (mListPreference == null) {

            Log.e(TAG, "onDeveloperOptionsSwitchDisabled: List preference is null");

            return;
@@ -230,14 +225,12 @@ public abstract class AbstractBluetoothListPreferenceController 
    }



    private void setupDefaultListPreference() {

        if (DEBUG) {

        Log.d(

                TAG,

                "setupDefaultListPreference: mDefaultEntry="

                        + mDefaultEntry

                        + ", mDefaultValue="

                        + mDefaultValue);

        }

        if (mListPreference == null) {

            Log.e(TAG, "setupListPreference: List preference is null");

            return;

src/com/android/settings/development/bluetooth/BluetoothCodecListPreferenceController.java

+11 −24
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ public class BluetoothCodecListPreferenceController 


    private static final String KEY = "bluetooth_audio_codec_settings_list";

    private static final String TAG = "BtExtCodecCtr";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    @Nullable private final Callback mCallback;
@@ -59,9 +58,7 @@ public class BluetoothCodecListPreferenceController 
    @Override

    public boolean isAvailable() {

        boolean available = Flags.a2dpOffloadCodecExtensibilitySettings();

        if (DEBUG) {

        Log.d(TAG, "isAvailable: " + available);

        }

        return available;

    }
@@ -82,9 +79,7 @@ public class BluetoothCodecListPreferenceController 
            return false;

        }



        if (DEBUG) {

        Log.d(TAG, "onPreferenceChange: newValue=" + (String) newValue);

        }

        final BluetoothA2dp bluetoothA2dp = mBluetoothA2dp;

        if (bluetoothA2dp == null) {

            Log.e(TAG, "onPreferenceChange: bluetoothA2dp is null");
@@ -110,9 +105,7 @@ public class BluetoothCodecListPreferenceController 
            return false;

        }



        if (DEBUG) {

        Log.d(TAG, "onPreferenceChange: setCodecConfigPreference: " + codecConfig.toString());

        }

        bluetoothA2dp.setCodecConfigPreference(activeDevice, codecConfig);

        if (mCallback != null) {

            mCallback.onBluetoothCodecChanged();
@@ -161,7 +154,6 @@ public class BluetoothCodecListPreferenceController 
                        && currentCodecConfig.getExtendedCodecType().equals(codecType)) {

                    selectedCodecId = codecIds.get(codecIds.size() - 1);

                    selectedLabel = labels.get(labels.size() - 1);

                    if (DEBUG) {

                    Log.d(

                            TAG,

                            "updateState: Current config: "
@@ -170,7 +162,6 @@ public class BluetoothCodecListPreferenceController 
                                    + selectedCodecId);

                }

            }

            }



            setupListPreference(labels, codecIds, selectedLabel, selectedCodecId);

        }
@@ -178,9 +169,7 @@ public class BluetoothCodecListPreferenceController 


    @Override

    public void onHDAudioEnabled(boolean enabled) {

        if (DEBUG) {

        Log.d(TAG, "onHDAudioEnabled: enabled=" + enabled);

        }

        if (mListPreference == null) {

            Log.e(TAG, "onHDAudioEnabled: List preference is null");

            return;
@@ -216,9 +205,7 @@ public class BluetoothCodecListPreferenceController 
            return;

        }



        if (DEBUG) {

        Log.d(TAG, "writeConfigurationValues: Selected codec: " + selectedCodecType.toString());

        }

        final BluetoothCodecStatus codecStatus = getBluetoothCodecStatus();

        if (codecStatus == null) {

            Log.e(TAG, "writeConfigurationValues: Bluetooth Codec Status is null");