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

Commit 0d6a3f6e authored by Omair Kamil's avatar Omair Kamil
Browse files

Move advertising methods into its own binder. 

Also moves permission checks for advertising into the binder methods.

Bug: 358692626
Flag: EXEMPT, mechanical refactor
Test: atest BluetoothInstrumentationTests, atest BumbleBluetoothTests
Change-Id: I66bc05937fdadedd53c11e1871899a50c2429eae
parent ecb352f5

android/app/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ filegroup { 
        "android/bluetooth/IBluetoothA2dp.aidl",

        "android/bluetooth/IBluetoothA2dpSink.aidl",

        "android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl",

        "android/bluetooth/IBluetoothAdvertise.aidl",

        "android/bluetooth/IBluetoothAvrcpController.aidl",

        "android/bluetooth/IBluetoothCallback.aidl",

        "android/bluetooth/IBluetoothConnectionCallback.aidl",

android/app/aidl/android/bluetooth/IBluetooth.aidl

+3 −0
Original line number Diff line number Diff line
@@ -344,4 +344,7 @@ interface IBluetooth 


    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")

    boolean isRfcommSocketOffloadSupported(in AttributionSource source);



    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    IBinder getBluetoothAdvertise();

}

android/app/aidl/android/bluetooth/IBluetoothAdvertise.aidl

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.bluetooth;



import android.bluetooth.le.AdvertiseSettings;

import android.bluetooth.le.AdvertiseData;

import android.bluetooth.le.AdvertisingSetParameters;

import android.bluetooth.le.IAdvertisingSetCallback;

import android.bluetooth.le.IPeriodicAdvertisingCallback;

import android.bluetooth.le.PeriodicAdvertisingParameters;

import android.content.AttributionSource;



/**

 * API for interacting with BLE advertising

 * @hide

 */

interface IBluetoothAdvertise {

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE,android.Manifest.permission.BLUETOOTH_PRIVILEGED}, conditional=true)")

    void startAdvertisingSet(in AdvertisingSetParameters parameters, in AdvertiseData advertiseData,

                                in AdvertiseData scanResponse, in PeriodicAdvertisingParameters periodicParameters,

                                in AdvertiseData periodicData, in int duration, in int maxExtAdvEvents, in int gattServerIf,

                                in IAdvertisingSetCallback callback, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void stopAdvertisingSet(in IAdvertisingSetCallback callback, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void getOwnAddress(in int advertiserId, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void enableAdvertisingSet(in int advertiserId, in boolean enable, in int duration, in int maxExtAdvEvents, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setAdvertisingData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setScanResponseData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE,android.Manifest.permission.BLUETOOTH_PRIVILEGED}, conditional=true)")

    void setAdvertisingParameters(in int advertiserId, in AdvertisingSetParameters parameters, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingParameters(in int advertiserId, in PeriodicAdvertisingParameters parameters, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingEnable(in int advertiserId, in boolean enable, in AttributionSource attributionSource);

}

android/app/aidl/android/bluetooth/IBluetoothGatt.aidl

+2 −42
Original line number Diff line number Diff line
@@ -16,30 +16,15 @@ 


package android.bluetooth;



import android.app.PendingIntent;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothGattService;

import android.bluetooth.le.AdvertiseSettings;

import android.bluetooth.le.AdvertiseData;

import android.bluetooth.le.AdvertisingSetParameters;

import android.bluetooth.IBluetoothGattCallback;

import android.bluetooth.IBluetoothGattServerCallback;

import android.bluetooth.le.DistanceMeasurementMethod;

import android.bluetooth.le.DistanceMeasurementParams;

import android.bluetooth.le.IDistanceMeasurementCallback;

import android.bluetooth.le.PeriodicAdvertisingParameters;

import android.bluetooth.le.ScanFilter;

import android.bluetooth.le.ScanResult;

import android.bluetooth.le.ScanSettings;

import android.bluetooth.le.ResultStorageDescriptor;

import android.content.AttributionSource;

import android.os.ParcelUuid;

import android.os.WorkSource;



import android.bluetooth.IBluetoothGattCallback;

import android.bluetooth.IBluetoothGattServerCallback;

import android.bluetooth.le.IAdvertisingSetCallback;

import android.bluetooth.le.IPeriodicAdvertisingCallback;

import android.bluetooth.le.IScannerCallback;



/**

 * API for interacting with BLE / GATT

 * @hide
@@ -48,31 +33,6 @@ interface IBluetoothGatt { 
    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE,android.Manifest.permission.BLUETOOTH_PRIVILEGED}, conditional=true)")

    void startAdvertisingSet(in AdvertisingSetParameters parameters, in AdvertiseData advertiseData,

                                in AdvertiseData scanResponse, in PeriodicAdvertisingParameters periodicParameters,

                                in AdvertiseData periodicData, in int duration, in int maxExtAdvEvents, in int gattServerIf,

                                in IAdvertisingSetCallback callback, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void stopAdvertisingSet(in IAdvertisingSetCallback callback, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void getOwnAddress(in int advertiserId, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void enableAdvertisingSet(in int advertiserId, in boolean enable, in int duration, in int maxExtAdvEvents, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setAdvertisingData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setScanResponseData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_ADVERTISE,android.Manifest.permission.BLUETOOTH_PRIVILEGED}, conditional=true)")

    void setAdvertisingParameters(in int advertiserId, in AdvertisingSetParameters parameters, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingParameters(in int advertiserId, in PeriodicAdvertisingParameters parameters, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingEnable(in int advertiserId, in boolean enable, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback, boolean eatt_support, in AttributionSource attributionSource);

android/app/aidl/android/bluetooth/le/IAdvertisingSetCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package android.bluetooth.le; 
 * @hide

 */

oneway interface IAdvertisingSetCallback {

  void onAdvertisingSetStarted(in IBinder gattBinder, in int advertiserId, in int tx_power, in int status);

  void onAdvertisingSetStarted(in IBinder advertiseBinder, in int advertiserId, in int tx_power, in int status);

  void onOwnAddressRead(in int advertiserId, in int addressType, in String address);

  void onAdvertisingSetStopped(in int advertiserId);

  void onAdvertisingEnabled(in int advertiserId, in boolean enable, in int status);