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

Commit 90c09eb2 authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge changes If4377414,I51676bef am: d9fb9799 am: 3c80a2c8 am: cf65b36d 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2218486



Change-Id: I2db68e1c14b49f9ad981aefcbea5c51013aff42d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13fad5e4 cf65b36d

android/pandora/server/Android.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -7,8 +7,6 @@ java_library_static { 




    srcs: ["src/**/*.kt"],

    srcs: ["src/**/*.kt"],





    platform_apis: true,



    sdk_version: "core_platform",

    sdk_version: "core_platform",





    libs: [

    libs: [
@@ -33,7 +31,6 @@ java_library_static { 




android_test_helper_app {

android_test_helper_app {

    name: "PandoraServer",

    name: "PandoraServer",

    certificate: "platform",





    static_libs: [

    static_libs: [

        "PandoraServerLib",

        "PandoraServerLib",

android/pandora/server/AndroidManifest.xml

+0 −10
Original line number Original line Diff line number Diff line
@@ -21,17 +21,7 @@ 
        <uses-library android:name="android.test.runner" />

        <uses-library android:name="android.test.runner" />

    </application>

    </application>





    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />

    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />

    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />





    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />





    <instrumentation android:name="com.android.pandora.Main"

    <instrumentation android:name="com.android.pandora.Main"

                     android:targetPackage="com.android.pandora"

                     android:targetPackage="com.android.pandora"

android/pandora/server/configs/PtsBotTest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -5,8 +5,8 @@ 
        <option name="install-arg" value="-g" />

        <option name="install-arg" value="-g" />

    </target_preparer>

    </target_preparer>





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

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

        <option name="post-install-cmd" value="am instrument -e Debug false com.android.pandora/.Main" />

        <option name="host-background-command" value="adb -s $SERIAL shell am instrument --no-hidden-api-checks -w com.android.pandora/.Main" />

    </target_preparer>

    </target_preparer>





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

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

android/pandora/server/configs/PtsBotTestMts.xml

+8 −2
Original line number Original line Diff line number Diff line
@@ -5,8 +5,8 @@ 
        <option name="install-arg" value="-g" />

        <option name="install-arg" value="-g" />

    </target_preparer>

    </target_preparer>





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

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

        <option name="post-install-cmd" value="am instrument -e Debug false com.android.pandora/.Main" />

        <option name="host-background-command" value="adb -s $SERIAL shell am instrument --no-hidden-api-checks -w com.android.pandora/.Main" />

    </target_preparer>

    </target_preparer>





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

    <target_preparer class="com.android.tradefed.targetprep.PythonVirtualenvPreparer">
@@ -21,8 +21,13 @@ 
        <option name="tests-config-file" value="pts_bot_tests_config.json" />

        <option name="tests-config-file" value="pts_bot_tests_config.json" />

        <option name="physical" value="false" />

        <option name="physical" value="false" />

        <option name="profile" value="A2DP/SRC" />

        <option name="profile" value="A2DP/SRC" />

        <option name="profile" value="AVCTP" />

        <option name="profile" value="AVDTP/SRC" />

        <option name="profile" value="AVDTP/SRC" />

        <option name="profile" value="AVRCP" />

        <option name="profile" value="GATT/CL/GAC" />

        <option name="profile" value="GATT/CL/GAC" />

        <option name="profile" value="GATT/CL/GAD" />

        <option name="profile" value="GATT/CL/GAR" />

        <option name="profile" value="GATT/CL/GAW" />

        <option name="profile" value="HFP/AG/DIS" />

        <option name="profile" value="HFP/AG/DIS" />

        <option name="profile" value="HFP/AG/HFI" />

        <option name="profile" value="HFP/AG/HFI" />

        <option name="profile" value="HFP/AG/SLC" />

        <option name="profile" value="HFP/AG/SLC" />
@@ -31,6 +36,7 @@ 
        <option name="profile" value="SM/CEN/EKS" />

        <option name="profile" value="SM/CEN/EKS" />

        <option name="profile" value="SM/CEN/JW" />

        <option name="profile" value="SM/CEN/JW" />

        <option name="profile" value="SM/CEN/KDU" />

        <option name="profile" value="SM/CEN/KDU" />

        <option name="profile" value="HOGP/RH" />

    </test>

    </test>





    <object type="module_controller"

    <object type="module_controller"

android/pandora/server/src/com/android/pandora/Main.kt

+4 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context 
import android.os.Bundle

import android.os.Bundle

import android.os.Debug

import android.os.Debug

import android.util.Log

import android.util.Log

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.core.app.ApplicationProvider.getApplicationContext

import androidx.test.core.app.ApplicationProvider.getApplicationContext

import androidx.test.runner.MonitoringInstrumentation

import androidx.test.runner.MonitoringInstrumentation
@@ -46,6 +47,9 @@ class Main : MonitoringInstrumentation() { 
    super.onStart()

    super.onStart()





    val context: Context = getApplicationContext()

    val context: Context = getApplicationContext()

    val uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation()

    // Adopt all the permissions of the shell

    uiAutomation.adoptShellPermissionIdentity()





    while (true) {

    while (true) {

      val server = Server(context)

      val server = Server(context)