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

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

Merge "Adds a report delay floor for LE batch scans" am: b76c52c3 

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

Change-Id: Ie2aa9cb7479f15c98126755cde6122d707391352
parents 8101c6be b76c52c3

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

+41 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import android.os.ServiceManager; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.os.WorkSource;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.util.Log;
@@ -100,6 +101,11 @@ public class GattService extends ProfileService { 
    private static final int TRUNCATED_RESULT_SIZE = 11;

    private static final int TIME_STAMP_LENGTH = 2;



    /**

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

     */

    private static final long DEFAULT_REPORT_DELAY_FLOOR = 5000;



    // onFoundLost related constants

    private static final int ADVT_STATE_ONFOUND = 0;

    private static final int ADVT_STATE_ONLOST = 1;
@@ -2100,6 +2106,7 @@ public class GattService extends ProfileService { 
        if (needsPrivilegedPermissionForScan(settings)) {

            enforcePrivilegedPermission();

        }

        settings = enforceReportDelayFloor(settings);

        final ScanClient scanClient = new ScanClient(scannerId, settings, filters, storages);

        scanClient.userHandle = UserHandle.of(UserHandle.getCallingUserId());

        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
@@ -2146,6 +2153,8 @@ public class GattService extends ProfileService { 
            enforcePrivilegedPermission();

        }



        settings = enforceReportDelayFloor(settings);



        UUID uuid = UUID.randomUUID();

        if (DBG) {

            Log.d(TAG, "startScan(PI) - UUID=" + uuid);
@@ -3275,6 +3284,38 @@ public class GattService extends ProfileService { 
                "Need UPDATE_DEVICE_STATS permission");

    }



    /**

     * Ensures the report delay is either 0 or at least the floor value (5000ms)

     *

     * @param  settings are the scan settings passed into a request to start le scanning

     * @return the passed in ScanSettings object if the report delay is 0 or above the floor value;

     *         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) {

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

            return settings;

        }



        long floor = DeviceConfig.getLong(DeviceConfig.NAMESPACE_BLUETOOTH, "report_delay",

                DEFAULT_REPORT_DELAY_FLOOR);



        if (settings.getReportDelayMillis() > floor) {

            return settings;

        } else {

            return new ScanSettings.Builder()

                    .setCallbackType(settings.getCallbackType())

                    .setLegacy(settings.getLegacy())

                    .setMatchMode(settings.getMatchMode())

                    .setNumOfMatches(settings.getNumOfMatches())

                    .setPhy(settings.getPhy())

                    .setReportDelay(floor)

                    .setScanMode(settings.getScanMode())

                    .setScanResultType(settings.getScanResultType())

                    .build();

        }

    }



    private void stopNextService(int serverIf, int status) throws RemoteException {

        if (DBG) {

            Log.d(TAG, "stopNextService() - serverIf=" + serverIf + ", status=" + status);