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

Commit 9f29b957 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev

parents df5bbc63 052c07b4

src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -33,10 +33,8 @@ import com.android.settings.search.BaseSearchIndexProvider; 
import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.search.SearchIndexable;



/** Settings fragment containing bluetooth audio routing. */

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class BluetoothDetailsAudioRoutingFragment extends RestrictedDashboardFragment {



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragmentTest.java

+0 −15
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.os.Bundle; 


import androidx.test.core.app.ApplicationProvider;



import com.android.settings.R;

import com.android.settings.testutils.XmlTestUtils;

import com.android.settings.testutils.shadow.ShadowBluetoothUtils;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
@@ -44,8 +42,6 @@ import org.mockito.junit.MockitoRule; 
import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;



import java.util.List;



/** Tests for {@link BluetoothDetailsAudioRoutingFragment}. */

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowBluetoothUtils.class})
@@ -92,17 +88,6 @@ public class BluetoothDetailsAudioRoutingFragmentTest { 
        assertThat(mFragment.mCachedDevice.getAddress()).isEqualTo(TEST_ADDRESS);

    }



    @Test

    public void getNonIndexableKeys_existInXmlLayout() {

        final List<String> niks = BluetoothDetailsAudioRoutingFragment.SEARCH_INDEX_DATA_PROVIDER

                .getNonIndexableKeys(mContext);

        final List<String> keys =

                XmlTestUtils.getKeysFromPreferenceXml(mContext,

                        R.xml.bluetooth_audio_routing_fragment);



        assertThat(keys).containsAtLeastElementsIn(niks);

    }



    private void setupEnvironment() {

        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;

        when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);