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

Commit 0eafb293 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "scan-manager-refactor" into main am: 54cbef7a am: 35674b24 

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



Change-Id: I27360f2c6b20aa375a43b74ac7080e1246963588
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc733f6f 35674b24

android/app/jni/com_android_bluetooth_gatt.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2599,7 +2599,7 @@ static int register_com_android_bluetooth_gatt_scan(JNIEnv* env) { 
       (void*)gattSetScanParametersNative},

  };

  return REGISTER_NATIVE_METHODS(

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

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

}



static int register_com_android_bluetooth_gatt_advertise_manager(JNIEnv* env) {
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 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;

import com.android.bluetooth.le_scan.ScanNativeInterface;



/**

 * Factory class for object initialization to help with unit testing

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/ScanFilterQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class ScanFilterQueue { 
    public static final int TYPE_INVALID = 0x00;

    public static final int TYPE_WIFI_NAN_HASH = 0x01; // WIFI NAN HASH type



    class Entry {

    public static class Entry {

        public byte type;

        public String address;

        public byte addr_type;

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);