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

Commit 2b32e429 authored by Ömer Faruk Yılmaz's avatar Ömer Faruk Yılmaz
Browse files

Move ScanClient from package `gatt` to `le_scan` 

See go/scan-manager-refactor for more details.

Test: m com.android.btservices
Bug: 313335632
Bug: 267361243
Change-Id: Ifc5c38d8797d320c465e7caa879e86069e7a98b7
parent 4aa2dbe8

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import com.android.bluetooth.flags.FeatureFlagsImpl; 
import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.le_scan.AppScanStats;

import com.android.bluetooth.le_scan.PeriodicScanManager;

import com.android.bluetooth.le_scan.ScanClient;

import com.android.bluetooth.le_scan.ScanManager;

import com.android.bluetooth.util.NumberUtils;

import com.android.internal.annotations.VisibleForTesting;

android/app/src/com/android/bluetooth/gatt/ScanClient.java→android/app/src/com/android/bluetooth/le_scan/ScanClient.java

+4 −6
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@ 
 * limitations under the License.

 */



package com.android.bluetooth.gatt;

package com.android.bluetooth.le_scan;



import android.bluetooth.le.ScanFilter;

import android.bluetooth.le.ScanSettings;

import android.os.Binder;

import android.os.UserHandle;



import com.android.bluetooth.le_scan.AppScanStats;



import java.util.List;

import java.util.Objects;
@@ -55,7 +53,7 @@ public class ScanClient { 
    private static final ScanSettings DEFAULT_SCAN_SETTINGS =

            new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build();



    ScanClient(int scannerId) {

    public ScanClient(int scannerId) {

        this(scannerId, DEFAULT_SCAN_SETTINGS, null);

    }
@@ -63,7 +61,7 @@ public class ScanClient { 
        this(scannerId, settings, filters, Binder.getCallingUid());

    }



    ScanClient(int scannerId, ScanSettings settings, List<ScanFilter> filters, int appUid) {

    public ScanClient(int scannerId, ScanSettings settings, List<ScanFilter> filters, int appUid) {

        this.scannerId = scannerId;

        this.settings = settings;

        this.scanModeApp = settings.getScanMode();
@@ -106,7 +104,7 @@ public class ScanClient { 
     * @param newScanMode

     * @return true if scan settings are updated, false otherwise.

     */

    public boolean updateScanMode(int newScanMode) {

    boolean updateScanMode(int newScanMode) {

        if (settings.getScanMode() == newScanMode) {

            return false;

        }

android/app/src/com/android/bluetooth/le_scan/ScanManager.java

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.bluetooth.gatt.FilterParams; 
import com.android.bluetooth.gatt.GattObjectsFactory;

import com.android.bluetooth.gatt.GattService;

import com.android.bluetooth.gatt.GattServiceConfig;

import com.android.bluetooth.gatt.ScanClient;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

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

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.bluetooth.btservice.AdapterService; 
import com.android.bluetooth.btservice.CompanionManager;

import com.android.bluetooth.le_scan.AppScanStats;

import com.android.bluetooth.le_scan.PeriodicScanManager;

import com.android.bluetooth.le_scan.ScanClient;

import com.android.bluetooth.le_scan.ScanManager;



import com.android.bluetooth.flags.Flags;

android/app/tests/unit/src/com/android/bluetooth/le_scan/ScanManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ import com.android.bluetooth.flags.Flags; 
import com.android.bluetooth.gatt.GattNativeInterface;

import com.android.bluetooth.gatt.GattObjectsFactory;

import com.android.bluetooth.gatt.GattService;

import com.android.bluetooth.gatt.ScanClient;

import com.android.bluetooth.le_scan.ScanClient;

import com.android.internal.app.IBatteryStats;



import org.junit.After;