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

Commit 6c377f51 authored by Kihong Seong's avatar Kihong Seong
Browse files

Enable bluetooth profiles and update Android.bp 

This CL enables A2DP Sink and Avrcp Controller for all targets, and
updates androidx.legacy_legacy-support-v4 dependency to
androidx.media_media

This change makes the following tests run:
- AvrcpControllerStateMachineTest
- AvrcpControllerServiceTest

Bug: 237467631
Test: atest AvrcpControllerStateMachineTest
Change-Id: I408d01901802d87464a7ae8a1a941a82fbb8a54f
parent 9602cf6a

android/app/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ android_app { 
    static_libs: [

        "android.hardware.radio-V1.0-java",

        "androidx.core_core",

        "androidx.legacy_legacy-support-v4",

        "androidx.media_media",

        "androidx.lifecycle_lifecycle-livedata",

        "androidx.room_room-runtime",

        "androidx.annotation_annotation",

android/app/tests/unit/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ java_defaults { 
    ],



    static_libs: [

        "androidx.legacy_legacy-support-v4",

        "androidx.media_media",

        "androidx.test.ext.truth",

        "androidx.test.rules",

        "androidx.test.espresso.intents",

android/app/tests/unit/AndroidTest.xml

+9 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
        <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />

        <option name="run-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.a2dp.sink.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.sap.server.enabled true" />

        <option name="teardown-command" value="cmd bluetooth_manager enable" />

        <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />

        <option name="teardown-command" value="setprop bluetooth.profile.hfp.hf.enabled false" />
@@ -37,6 +41,11 @@ 
                value="setprop bluetooth.profile.pbap.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.map.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled false" />

        <option name="teardown-command" value="setprop bluetooth.profile.a2dp.sink.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.sap.server.enabled false" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.FolderSaver">

        <option name="device-path" value="/data/vendor/ssrdump" />

android/app/tests/unit/GoogleAndroidTest.xml

+10 −0
Original line number Diff line number Diff line
@@ -30,12 +30,22 @@ 
        <option name="run-command" value="setprop bluetooth.profile.hfp.hf.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.pbap.client.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.map.client.enabled true" />

        <option name="run-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.a2dp.sink.enabled true" />

        <option name="run-command" value="setprop bluetooth.profile.sap.server.enabled true" />

        <option name="teardown-command" value="cmd bluetooth_manager enable" />

        <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.pbap.client.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.map.client.enabled false" />

        <option name="teardown-command" value="setprop bluetooth.profile.hfp.hf.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.avrcp.controller.enabled false" />

        <option name="teardown-command" value="setprop bluetooth.profile.a2dp.sink.enabled false" />

        <option name="teardown-command"

                value="setprop bluetooth.profile.sap.server.enabled false" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.FolderSaver">

        <option name="device-path" value="/data/vendor/ssrdump" />

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import org.junit.After; 
import org.junit.Assert;

import org.junit.Assume;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -1428,6 +1429,7 @@ public class AvrcpControllerStateMachineTest { 
    /**

     * Test receiving an audio focus loss event. A pause should be sent if we were playing

     */

    @Ignore("b/260948676")

    @Test

    public void testOnAudioFocusLossWhilePlaying_pauseSent() {

        setUpConnectedState(true, true);