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

Commit 686aeff3 authored by Ömer Faruk Yılmaz's avatar Ömer Faruk Yılmaz
Browse files

Add additional GattServiceTest #2 

Bug: 237467631
Test: atest GattServiceTest
Change-Id: I41631380f4de987b57154194741151e0cfe1ddad
parent 254a7779

android/app/src/com/android/bluetooth/gatt/AdvertiseManager.java

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.util.Log; 


import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.gatt.GattService.AdvertiserMap;

import com.android.internal.annotations.VisibleForTesting;



import java.util.Collections;

import java.util.HashMap;
@@ -41,7 +42,8 @@ import java.util.Map; 
 *

 * @hide

 */

class AdvertiseManager {

@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

public class AdvertiseManager {

    private static final boolean DBG = GattServiceConfig.DBG;

    private static final String TAG = GattServiceConfig.TAG_PREFIX + "AdvertiseManager";

android/app/src/com/android/bluetooth/gatt/GattService.java

+12 −6
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ public class GattService extends ProfileService { 
    /**

     * The default floor value for LE batch scan report delays greater than 0

     */

    private static final long DEFAULT_REPORT_DELAY_FLOOR = 5000;

    @VisibleForTesting

    static final long DEFAULT_REPORT_DELAY_FLOOR = 5000;



    // onFoundLost related constants

    private static final int ADVT_STATE_ONFOUND = 0;
@@ -273,9 +274,12 @@ public class GattService extends ProfileService { 


    private AdapterService mAdapterService;

    private BluetoothAdapterProxy mBluetoothAdapterProxy;

    private AdvertiseManager mAdvertiseManager;

    private PeriodicScanManager mPeriodicScanManager;

    private ScanManager mScanManager;

    @VisibleForTesting

    AdvertiseManager mAdvertiseManager;

    @VisibleForTesting

    PeriodicScanManager mPeriodicScanManager;

    @VisibleForTesting

    ScanManager mScanManager;

    private AppOpsManager mAppOps;

    private CompanionDeviceManager mCompanionManager;

    private String mExposureNotificationPackage;
@@ -308,7 +312,8 @@ public class GattService extends ProfileService { 
    /**

     * Reliable write queue

     */

    private Set<String> mReliableQueue = new HashSet<String>();

    @VisibleForTesting

    Set<String> mReliableQueue = new HashSet<String>();



    private GattNativeInterface mNativeInterface;
@@ -4727,7 +4732,8 @@ public class GattService extends ProfileService { 
     *         a new ScanSettings object with the report delay being the floor value if the original

     *         report delay was between 0 and the floor value (exclusive of both)

     */

    private ScanSettings enforceReportDelayFloor(ScanSettings settings) {

    @VisibleForTesting

    ScanSettings enforceReportDelayFloor(ScanSettings settings) {

        if (settings.getReportDelayMillis() == 0) {

            return settings;

        }

android/app/src/com/android/bluetooth/gatt/PeriodicScanManager.java

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.RemoteException; 
import android.util.Log;



import com.android.bluetooth.btservice.AdapterService;

import com.android.internal.annotations.VisibleForTesting;



import java.util.Collections;

import java.util.HashMap;
@@ -39,7 +40,8 @@ import java.util.concurrent.ConcurrentHashMap; 
 *

 * @hide

 */

class PeriodicScanManager {

@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

public class PeriodicScanManager {

    private static final boolean DBG = GattServiceConfig.DBG;

    private static final String TAG = GattServiceConfig.TAG_PREFIX + "SyncManager";

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

+540 −0

File changed.

Preview size limit exceeded, changes collapsed.