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

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

Move PeriodicScanManager 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: I1fe2f74a9e625c9ede5af3c9a853f1ae8b6918b5
parent f9e41790

android/app/jni/com_android_bluetooth_gatt.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2669,7 +2669,7 @@ static int register_com_android_bluetooth_gatt_periodic_scan(JNIEnv* env) { 
       (void*)transferSetInfoNative},

  };

  const int result = REGISTER_NATIVE_METHODS(

      env, "com/android/bluetooth/gatt/PeriodicScanNativeInterface", methods);

      env, "com/android/bluetooth/le_scan/PeriodicScanNativeInterface", methods);

  if (result != 0) {

    return result;

  }
@@ -2683,7 +2683,7 @@ static int register_com_android_bluetooth_gatt_periodic_scan(JNIEnv* env) { 
      {"onBigInfoReport", "(IZ)V", &method_onBigInfoReport},

  };

  GET_JAVA_METHODS(env,

                   "com/android/bluetooth/gatt/PeriodicScanNativeInterface",

                   "com/android/bluetooth/le_scan/PeriodicScanNativeInterface",

                   javaMethods);



  return 0;

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

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

import com.android.bluetooth.btservice.BluetoothAdapterProxy;

import com.android.bluetooth.flags.FeatureFlags;

import com.android.bluetooth.le_scan.PeriodicScanManager;

import com.android.bluetooth.le_scan.ScanManager;



/**

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

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import com.android.bluetooth.btservice.ProfileService; 
import com.android.bluetooth.flags.FeatureFlags;

import com.android.bluetooth.flags.FeatureFlagsImpl;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.le_scan.PeriodicScanManager;

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/PeriodicScanManager.java→android/app/src/com/android/bluetooth/le_scan/PeriodicScanManager.java

+9 −7
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.bluetooth.gatt;

package com.android.bluetooth.le_scan;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;
@@ -28,6 +28,7 @@ import android.os.RemoteException; 
import android.util.Log;



import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.gatt.GattServiceConfig;

import com.android.internal.annotations.VisibleForTesting;



import java.util.Collections;
@@ -52,8 +53,9 @@ public class PeriodicScanManager { 
    static int sTempRegistrationId = -1;

    private static final int PA_SOURCE_LOCAL = 1;

    private static final int PA_SOURCE_REMOTE = 2;



    /** Constructor of {@link PeriodicScanManager}. */

    PeriodicScanManager(AdapterService adapterService) {

    public PeriodicScanManager(AdapterService adapterService) {

        if (DBG) {

            Log.d(TAG, "periodic scan manager created");

        }
@@ -62,7 +64,7 @@ public class PeriodicScanManager { 
        mNativeInterface.init(this);

    }



    void cleanup() {

    public void cleanup() {

        if (DBG) {

            Log.d(TAG, "cleanup()");

        }
@@ -263,7 +265,7 @@ public class PeriodicScanManager { 
        }

    }



    void startSync(ScanResult scanResult, int skip, int timeout,

    public void startSync(ScanResult scanResult, int skip, int timeout,

            IPeriodicAdvertisingCallback callback) {

        SyncDeathRecipient deathRecipient = new SyncDeathRecipient(callback);

        IBinder binder = toBinder(callback);
@@ -325,7 +327,7 @@ public class PeriodicScanManager { 
        mNativeInterface.startSync(sid, address, skip, timeout, cbId);

    }



    void stopSync(IPeriodicAdvertisingCallback callback) {

    public void stopSync(IPeriodicAdvertisingCallback callback) {

        IBinder binder = toBinder(callback);

        if (DBG) {

            Log.d(TAG, "stopSync() " + binder);
@@ -372,7 +374,7 @@ public class PeriodicScanManager { 
        }

    }



    void transferSync(BluetoothDevice bda, int serviceData, int syncHandle) {

    public void transferSync(BluetoothDevice bda, int serviceData, int syncHandle) {

        Log.d(TAG, "transferSync()");

        Map.Entry<IBinder, SyncInfo> entry = findSync(syncHandle);

        if (entry == null) {
@@ -385,7 +387,7 @@ public class PeriodicScanManager { 
        mNativeInterface.syncTransfer(bda, serviceData, syncHandle);

    }



    void transferSetInfo(BluetoothDevice bda, int serviceData,

    public void transferSetInfo(BluetoothDevice bda, int serviceData,

                  int advHandle, IPeriodicAdvertisingCallback callback) {

        SyncDeathRecipient deathRecipient = new SyncDeathRecipient(callback);

        IBinder binder = toBinder(callback);

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

+2 −1
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
 * limitations under the License.

 */



package com.android.bluetooth.gatt;

package com.android.bluetooth.le_scan;



import android.bluetooth.BluetoothDevice;

import android.util.Log;



import com.android.bluetooth.gatt.GattServiceConfig;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;