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

Commit b06b62dc authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Merge constructor and start in ScanManager" into main am: b847b024... 

Merge "Merge constructor and start in ScanManager" into main am: b847b024 am: dd521f9b am: 240f53a6

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



Change-Id: Iddc22b027e2484ab4079e1ad89e608aca6ace03a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ca53097 240f53a6

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

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.bluetooth.gatt;



import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE;



import static com.android.bluetooth.Utils.callerIsSystemOrActiveOrManagedUser;

import static com.android.bluetooth.Utils.checkCallerTargetSdk;

import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;
@@ -358,7 +359,6 @@ public class GattService extends ProfileService { 


        mScanManager = GattObjectsFactory.getInstance()

                .createScanManager(this, mAdapterService, mBluetoothAdapterProxy);

        mScanManager.start();



        mPeriodicScanManager = GattObjectsFactory.getInstance()

                .createPeriodicScanManager(mAdapterService);

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

+0 −2
Original line number Diff line number Diff line
@@ -179,9 +179,7 @@ public class ScanManager { 
        mPriorityMap.put(ScanSettings.SCAN_MODE_BALANCED, 4);

        mPriorityMap.put(ScanSettings.SCAN_MODE_AMBIENT_DISCOVERY, 4);

        mPriorityMap.put(ScanSettings.SCAN_MODE_LOW_LATENCY, 5);

    }



    void start() {

        HandlerThread thread = new HandlerThread("BluetoothScanManager");

        thread.start();

        mHandler = new ClientHandler(thread.getLooper());

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

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ public class ScanManagerTest { 
        doReturn(mTargetContext.getPackageName()).when(mMockGattService).getPackageName();



        mScanManager = new ScanManager(mMockGattService, mAdapterService, mBluetoothAdapterProxy);

        mScanManager.start();



        mHandler = mScanManager.getClientHandler();

        assertThat(mHandler).isNotNull();