Merge "Enable bluetooth profiles and update Android.bp" into tm-qpr-dev

android/app/Android.bp

@@ -108,7 +108,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

@@ -18,6 +18,7 @@ java_defaults {
     ],
 
     static_libs: [
+        "androidx.media_media",
         "androidx.test.ext.truth",
         "androidx.test.rules",
         "mockito-target",

android/app/tests/unit/AndroidTest.xml

@@ -31,6 +31,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="cmd bluetooth_manager wait-for-state:STATE_ON" />
         <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />
@@ -39,6 +43,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

@@ -31,6 +31,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="cmd bluetooth_manager wait-for-state:STATE_ON" />
         <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />
@@ -38,6 +42,12 @@
                 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" />