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

Commit 62637322 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix GattServiceTests that depend on previous GattService flow" into main am: 5de0af24 

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



Change-Id: I30ae1a2e770cd1548d213e9765b1eac98933d84f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71f9964b 5de0af24

android/app/tests/unit/src/com/android/bluetooth/gatt/GattServiceTest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import android.content.AttributionSource; 
import android.content.Context;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources;

import android.location.LocationManager;

import android.location.LocationManager;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.platform.test.flag.junit.SetFlagsRule;





import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;
@@ -640,6 +641,7 @@ public class GattServiceTest { 
    }

    }





    @Test

    @Test

    @DisableFlags(Flags.FLAG_SCAN_MANAGER_REFACTOR)

    public void numHwTrackFiltersAvailable() {

    public void numHwTrackFiltersAvailable() {

        mService.getTransitionalScanHelper().numHwTrackFiltersAvailable(mAttributionSource);

        mService.getTransitionalScanHelper().numHwTrackFiltersAvailable(mAttributionSource);

        verify(mScanManager).getCurrentUsedTrackingAdvertisement();

        verify(mScanManager).getCurrentUsedTrackingAdvertisement();
@@ -680,6 +682,7 @@ public class GattServiceTest { 
    }

    }





    @Test

    @Test

    @DisableFlags(Flags.FLAG_SCAN_MANAGER_REFACTOR)

    public void profileConnectionStateChanged_notifyScanManager() {

    public void profileConnectionStateChanged_notifyScanManager() {

        mService.notifyProfileConnectionStateChange(

        mService.notifyProfileConnectionStateChange(

                BluetoothProfile.A2DP,

                BluetoothProfile.A2DP,