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

Commit e78bd0dc authored by Gopi Sakshihally Bhuthaiah (xWF)'s avatar Gopi Sakshihally Bhuthaiah (xWF) Committed by Automerger Merge Worker
Browse files

Merge "One second delay introduced to avoid setting app interference" into... 

Merge "One second delay introduced to avoid setting app interference" into main am: 8be4a2b0 am: 5660db98

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



Change-Id: Ia1e6fc90d1fe24de3bc8bae702216dc2fb87875c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f13cdd5 5660db98

framework/tests/bumble/src/android/bluetooth/pairing/PairingTest.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -88,12 +88,14 @@ import java.util.Arrays; 
import java.util.HashMap;

import java.util.HashMap;

import java.util.Map;

import java.util.Map;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeUnit;





@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

public class PairingTest {

public class PairingTest {

    private static final String TAG = "PairingTest";

    private static final String TAG = "PairingTest";

    private static final Duration BOND_INTENT_TIMEOUT = Duration.ofSeconds(10);

    private static final Duration BOND_INTENT_TIMEOUT = Duration.ofSeconds(10);

    private static final int TEST_DELAY_MS = 1000;





    private static final ParcelUuid BATTERY_UUID =

    private static final ParcelUuid BATTERY_UUID =

            ParcelUuid.fromString("0000180F-0000-1000-8000-00805F9B34FB");

            ParcelUuid.fromString("0000180F-0000-1000-8000-00805F9B34FB");
@@ -845,6 +847,10 @@ public class PairingTest { 
                hasExtra(BluetoothA2dp.EXTRA_STATE, BluetoothA2dp.STATE_CONNECTED),

                hasExtra(BluetoothA2dp.EXTRA_STATE, BluetoothA2dp.STATE_CONNECTED),

                hasExtra(BluetoothDevice.EXTRA_DEVICE, mBumbleDevice));

                hasExtra(BluetoothDevice.EXTRA_DEVICE, mBumbleDevice));





        // Todo: b/382118305 - due to settings app interference, profile connection initiate twice

        // after bonding. Introduced 1 second delay after first profile connection success

        final CompletableFuture<Integer> future = new CompletableFuture<>();

        future.completeOnTimeout(null, TEST_DELAY_MS, TimeUnit.MILLISECONDS).join();

        // Disconnect all profiles

        // Disconnect all profiles

        assertThat(mBumbleDevice.disconnect()).isEqualTo(BluetoothStatusCodes.SUCCESS);

        assertThat(mBumbleDevice.disconnect()).isEqualTo(BluetoothStatusCodes.SUCCESS);

        verifyIntentReceived(

        verifyIntentReceived(