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

Commit 1944fdd7 authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "[Pandora] - Enable A2DP/SNK/CC Tests" am: 85fc41e2 am: 665ec282 am:... 

Merge "[Pandora] - Enable A2DP/SNK/CC Tests" am: 85fc41e2 am: 665ec282 am: e7a12742 am: a9daa957

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



Change-Id: Ide7227de03c6c08c80729242c0a35f1aac56c46c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbb53219 a9daa957

android/pandora/server/configs/PtsBotTest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
        <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="A2DP/SNK/CC" />

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

        <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="AVRCP" />

android/pandora/server/configs/PtsBotTestMts.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
        <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="A2DP/SNK/CC" />

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

        <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="AVRCP" />

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Intent 
import android.content.IntentFilter

import android.content.IntentFilter

import android.net.MacAddress

import android.net.MacAddress

import android.os.ParcelFileDescriptor

import android.os.ParcelFileDescriptor

import android.util.Log

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry

import com.google.protobuf.ByteString

import com.google.protobuf.ByteString

import io.grpc.stub.StreamObserver

import io.grpc.stub.StreamObserver
@@ -226,7 +227,10 @@ fun <T> getProfileProxy(context: Context, profile: Int): T { 
    }

    }

    proxy = withTimeoutOrNull(5_000) { flow.first() }

    proxy = withTimeoutOrNull(5_000) { flow.first() }

  }

  }

  return proxy!! as T

  if (proxy == null) {

    Log.w(TAG, "profile proxy $profile is null")

  }

  return proxy as T

}

}





fun Intent.getBluetoothDeviceExtra(): BluetoothDevice =

fun Intent.getBluetoothDeviceExtra(): BluetoothDevice =