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

Commit 2cbce471 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "BumbleBluetoothTests: add EnableBluetoothRule in Sdp tests" into main

parents 2d6e3ff8 95730a55

framework/tests/bumble/src/android/bluetooth/RfcommTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class RfcommTest { 
    // Set up a Bumble Pandora device for the duration of the test.

    @Rule(order = 1) @JvmField val mBumble = PandoraDevice()



    @Rule(order = 2) @JvmField val EnableBluetoothRule = EnableBluetoothRule(false, true)

    @Rule(order = 2) @JvmField val enableBluetoothRule = EnableBluetoothRule(false, true)



    private lateinit var mBumbleDevice: BluetoothDevice

    private lateinit var host: Host

framework/tests/bumble/src/android/bluetooth/SdpClientTest.java

+8 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package android.bluetooth; 


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



import android.bluetooth.test_utils.EnableBluetoothRule;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -53,9 +54,14 @@ public class SdpClientTest { 


    private SettableFuture<List<ParcelUuid>> mFutureIntent;



    @Rule public final AdoptShellPermissionsRule mPermissionRule = new AdoptShellPermissionsRule();

    @Rule(order = 0)

    public final AdoptShellPermissionsRule mPermissionRule = new AdoptShellPermissionsRule();



    @Rule public final PandoraDevice mBumble = new PandoraDevice();

    @Rule(order = 1)

    public final PandoraDevice mBumble = new PandoraDevice();



    @Rule(order = 2)

    public final EnableBluetoothRule enableBluetoothRule = new EnableBluetoothRule(false, true);



    private BroadcastReceiver mConnectionStateReceiver =

            new BroadcastReceiver() {