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

Commit a1579c00 authored by Haijie Hong's avatar Haijie Hong
Browse files

Clean up flag for set preferred transport for LE 

Bug: 330581926
Test: local build
Flag: EXEMPT clean up
Change-Id: I2f74d52c2d48e454f1f01fe7db9c355e904ab610
parent 95a16504

packages/SettingsLib/aconfig/settingslib.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -36,16 +36,6 @@ flag { 
    bug: "388674074"

}



flag {

    name: "enable_set_preferred_transport_for_le_audio_device"

    namespace: "bluetooth"

    description: "Enable setting preferred transport for Le Audio device"

    bug: "330581926"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_determining_advanced_details_header_with_metadata"

    namespace: "pixel_cross_device_control"

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

+2 −4
Original line number Diff line number Diff line
@@ -313,8 +313,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
                        mLocalNapRoleConnected = true;

                    }

                }

                if (Flags.enableSetPreferredTransportForLeAudioDevice()

                        && profile instanceof HidProfile) {

                if (profile instanceof HidProfile) {

                    updatePreferredTransport();

                }

            } else if (profile instanceof MapProfile
@@ -329,8 +328,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
                mLocalNapRoleConnected = false;

            }



            if (Flags.enableSetPreferredTransportForLeAudioDevice()

                    && profile instanceof LeAudioProfile) {

            if (profile instanceof LeAudioProfile) {

                updatePreferredTransport();

            }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.settingslib.bluetooth;



import static com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING;

import static com.android.settingslib.flags.Flags.FLAG_ENABLE_SET_PREFERRED_TRANSPORT_FOR_LE_AUDIO_DEVICE;

import static com.android.settingslib.flags.Flags.FLAG_ENABLE_TEMPORARY_BOND_DEVICES_UI;



import static com.google.common.truth.Truth.assertThat;
@@ -138,7 +137,6 @@ public class CachedBluetoothDeviceTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_TV_MEDIA_OUTPUT_DIALOG);

        mSetFlagsRule.enableFlags(FLAG_ENABLE_SET_PREFERRED_TRANSPORT_FOR_LE_AUDIO_DEVICE);

        mSetFlagsRule.enableFlags(FLAG_ENABLE_LE_AUDIO_SHARING);

        mSetFlagsRule.enableFlags(FLAG_ENABLE_TEMPORARY_BOND_DEVICES_UI);

        mContext = RuntimeEnvironment.application;