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

Commit 82a962fd authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15636132, 15634622, 15636419, 15634623, 15635081,... 

Merge cherrypicks of [15636132, 15634622, 15636419, 15634623, 15635081, 15636346, 15636347, 15635821, 15635822, 15635823, 15635824, 15636496, 15636421, 15635984, 15636005, 15636133, 15635225, 15635189, 15636250, 15636380, 15636422, 15636348, 15636349, 15636350, 15632848, 15636382, 15636383, 15636266, 15636351, 15636423, 15636352, 15635986, 15636220, 15636252] into sc-d1-release

Change-Id: Ic3c35fa39ed0f02698260ca6f70ea4f34017b697
parents 2472a588 0b0d16d2

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

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon 
     */

    @Override

    protected void refresh() {

        updatePreferences(mContext, mCachedDevice.getAddress(), mProfilesContainer);

        // Do nothing. More details in b/191992001

    }



    /**

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager; 
import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;



import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -41,6 +42,7 @@ import java.util.List; 
import java.util.Objects;

import java.util.stream.Collectors;



@Ignore("b/191992001")

@RunWith(RobolectricTestRunner.class)

public class BluetoothDetailsCompanionAppsControllerTest extends

        BluetoothDetailsControllerTestBase {