Snap for 11465908 from 614fd49f5a82eee9698f35da6ff4e427553b3654 to 24Q2-release (f596be75) · Commits · e / os / android_packages_modules_Bluetooth

android/app/tests/unit/src/com/android/bluetooth/map/BluetoothMapSettingsTest.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -25,14 +25,21 @@ import static androidx.test.espresso.assertion.ViewAssertions.matches;
		import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
		import static androidx.test.espresso.matcher.ViewMatchers.withId;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;

		import androidx.test.core.app.ActivityScenario;
		import androidx.test.filters.FlakyTest;
		import androidx.test.filters.LargeTest;
		import androidx.test.platform.app.InstrumentationRegistry;
		import androidx.test.runner.AndroidJUnit4;
		import androidx.test.uiautomator.By;
		import androidx.test.uiautomator.UiDevice;
		import androidx.test.uiautomator.UiObject2;
		import androidx.test.uiautomator.Until;

		import com.android.bluetooth.R;
		import com.android.bluetooth.TestUtils;
		@@ -64,15 +71,23 @@ public class BluetoothMapSettingsTest {
		public void tearDown() throws Exception {
		TestUtils.tearDownUiTest();
		if (mActivityScenario != null) {
		// Workaround for b/159805732. Without this, test hangs for 45 seconds.
		Thread.sleep(1_000);
		mActivityScenario.close();
		}
		enableActivity(false);
		}

		@Test
		@FlakyTest
		public void initialize() throws Exception {
		UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());

		long timeoutMs = 5_000;
		String activityLabel = mTargetContext.getString(R.string.bluetooth_map_settings_title);
		UiObject2 object = device.wait(Until.findObject(By.text(activityLabel)), timeoutMs);
		assertThat(object).isNotNull();

		object.click();

		onView(withId(R.id.bluetooth_map_settings_list_view)).check(matches(isDisplayed()));
		}

flags/content_profiles.aconfig

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		package: "com.android.bluetooth.flags"
		container: "com.android.btservices"

		flag {
		name: "content_profiles_errors_metrics"
		namespace: "bluetooth"
		description: "Enable logging error metrics in content profiles"
		bug: "317002318"
		}

flags/leaudio.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -149,3 +149,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "leaudio_start_stream_race_fix"
		namespace: "bluetooth"
		description: "Fix possible race on start stream request"
		bug: "325181889"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

system/bta/Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -388,8 +388,6 @@ cc_test {
		"test/bta_hf_client_security_test.cc",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libcrypto",
		"libcutils",
		"liblog",

system/bta/dm/bta_dm_pm.cc

+5 −1

Original line number	Diff line number	Diff line
		@@ -938,8 +938,12 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, const int ssr) {
		/* HH has the per connection SSR preference, already read the SSR params
		* from BTA HH */
		if (current_ssr_index == BTA_DM_PM_SSR_HH) {
		tAclLinkSpec link_spec;
		link_spec.addrt.bda = peer_addr;
		link_spec.addrt.type = BLE_ADDR_PUBLIC;
		link_spec.transport = BT_TRANSPORT_BR_EDR;
		if (GetInterfaceToProfiles()->profileSpecific_HACK->bta_hh_read_ssr_param(
		peer_addr, &p_spec_cur->max_lat, &p_spec_cur->min_rmt_to) ==
		link_spec, &p_spec_cur->max_lat, &p_spec_cur->min_rmt_to) ==
		BTA_HH_ERR) {
		continue;
		}