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

Commit d56ceb44 authored by Oli Lan's avatar Oli Lan Committed by Jeff Sharkey
Browse files

Add AttributionSource to BT methods. 

This adds attribution source as a parameter to Bluetooth methods

This is now required to allow the app ops for the new
bluetooth permissions (BLUETOOTH_CONNECT, BLUETOOTH_ADVERTISE,
and BLUETOOTH_SCAN) to be noted.

Bug: 183626112
Test: atest BluetoothInstrumentationTests
Change-Id: I8c10fe46d43f4ca1cd4f902f1cf53ede72b689d1
parent 531230b7

system/binder/android/bluetooth/IBluetoothGatt.aidl

+52 −52
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ import android.bluetooth.le.IScannerCallback; 
 */

interface IBluetoothGatt {

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

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

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



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

    void registerScanner(in IScannerCallback callback, in WorkSource workSource);

    void registerScanner(in IScannerCallback callback, in WorkSource workSource, in AttributionSource attributionSource);

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

    void unregisterScanner(in int scannerId);

    void unregisterScanner(in int scannerId, in AttributionSource attributionSource);

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

    void startScan(in int scannerId, in ScanSettings settings, in List<ScanFilter> filters,

                   in List scanStorages, in AttributionSource attributionSource);
@@ -56,121 +56,121 @@ interface IBluetoothGatt { 
    void startScanForIntent(in PendingIntent intent, in ScanSettings settings, in List<ScanFilter> filters,

                            in AttributionSource attributionSource);

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

    void stopScanForIntent(in PendingIntent intent);

    void stopScanForIntent(in PendingIntent intent, in AttributionSource attributionSource);

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

    void stopScan(in int scannerId);

    void stopScan(in int scannerId, in AttributionSource attributionSource);

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

    void flushPendingBatchResults(in int scannerId);

    void flushPendingBatchResults(in int scannerId, in AttributionSource attributionSource);



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

    void startAdvertisingSet(in AdvertisingSetParameters parameters, in AdvertiseData advertiseData,

                                in AdvertiseData scanResponse, in PeriodicAdvertisingParameters periodicParameters,

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

                                in IAdvertisingSetCallback callback);

                                in IAdvertisingSetCallback callback, in AttributionSource attributionSource);

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

    void stopAdvertisingSet(in IAdvertisingSetCallback callback);

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



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

    void getOwnAddress(in int advertiserId);

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

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

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

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

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

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

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

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

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

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

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



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

    void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback);

    void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback, in AttributionSource attributionSource);

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

    void unregisterSync(in IPeriodicAdvertisingCallback callback);

    void unregisterSync(in IPeriodicAdvertisingCallback callback, in AttributionSource attributionSource);



    @UnsupportedAppUsage

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

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

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



    @UnsupportedAppUsage

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

    void unregisterClient(in int clientIf);

    void unregisterClient(in int clientIf, in AttributionSource attributionSource);

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

    void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in boolean opportunistic, in int phy);

    void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in boolean opportunistic, in int phy, in AttributionSource attributionSource);

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

    void clientDisconnect(in int clientIf, in String address);

    void clientDisconnect(in int clientIf, in String address, in AttributionSource attributionSource);

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

    void clientSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions);

    void clientSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions, in AttributionSource attributionSource);

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

    void clientReadPhy(in int clientIf, in String address);

    void clientReadPhy(in int clientIf, in String addres, in AttributionSource attributionSources);

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

    void refreshDevice(in int clientIf, in String address);

    void refreshDevice(in int clientIf, in String address, in AttributionSource attributionSource);

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

    void discoverServices(in int clientIf, in String address);

    void discoverServices(in int clientIf, in String address, in AttributionSource attributionSource);

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

    void discoverServiceByUuid(in int clientIf, in String address, in ParcelUuid uuid);

    void discoverServiceByUuid(in int clientIf, in String address, in ParcelUuid uuid, in AttributionSource attributionSource);

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

    void readCharacteristic(in int clientIf, in String address, in int handle, in int authReq);

    void readCharacteristic(in int clientIf, in String address, in int handle, in int authReq, in AttributionSource attributionSource);

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

    void readUsingCharacteristicUuid(in int clientIf, in String address, in ParcelUuid uuid,

                           in int startHandle, in int endHandle, in int authReq);

                           in int startHandle, in int endHandle, in int authReq, in AttributionSource attributionSource);

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

    void writeCharacteristic(in int clientIf, in String address, in int handle,

                            in int writeType, in int authReq, in byte[] value);

                            in int writeType, in int authReq, in byte[] value, in AttributionSource attributionSource);

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

    void readDescriptor(in int clientIf, in String address, in int handle, in int authReq);

    void readDescriptor(in int clientIf, in String address, in int handle, in int authReq, in AttributionSource attributionSource);

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

    void writeDescriptor(in int clientIf, in String address, in int handle,

                            in int authReq, in byte[] value);

                            in int authReq, in byte[] value, in AttributionSource attributionSource);

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

    void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable);

    void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable, in AttributionSource attributionSource);

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

    void beginReliableWrite(in int clientIf, in String address);

    void beginReliableWrite(in int clientIf, in String address, in AttributionSource attributionSource);

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

    void endReliableWrite(in int clientIf, in String address, in boolean execute);

    void endReliableWrite(in int clientIf, in String address, in boolean execute, in AttributionSource attributionSource);

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

    void readRemoteRssi(in int clientIf, in String address);

    void readRemoteRssi(in int clientIf, in String address, in AttributionSource attributionSource);

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

    void configureMTU(in int clientIf, in String address, in int mtu);

    void configureMTU(in int clientIf, in String address, in int mtu, in AttributionSource attributionSource);

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

    void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority);

    void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority, in AttributionSource attributionSource);

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

    void leConnectionUpdate(int clientIf, String address, int minInterval,

                            int maxInterval, int peripheralLatency, int supervisionTimeout,

                            int minConnectionEventLen, int maxConnectionEventLen);

                            int minConnectionEventLen, int maxConnectionEventLen, in AttributionSource attributionSource);



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

    void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback, boolean eatt_support);

    void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback, boolean eatt_support, in AttributionSource attributionSource);

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

    void unregisterServer(in int serverIf);

    void unregisterServer(in int serverIf, in AttributionSource attributionSource);

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

    void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport);

    void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport, in AttributionSource attributionSource);

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

    void serverDisconnect(in int serverIf, in String address);

    void serverDisconnect(in int serverIf, in String address, in AttributionSource attributionSource);

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

    void serverSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions);

    void serverSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions, in AttributionSource attributionSource);

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

    void serverReadPhy(in int clientIf, in String address);

    void serverReadPhy(in int clientIf, in String address, in AttributionSource attributionSource);

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

    void addService(in int serverIf, in BluetoothGattService service);

    void addService(in int serverIf, in BluetoothGattService service, in AttributionSource attributionSource);

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

    void removeService(in int serverIf, in int handle);

    void removeService(in int serverIf, in int handle, in AttributionSource attributionSource);

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

    void clearServices(in int serverIf);

    void clearServices(in int serverIf, in AttributionSource attributionSource);

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

    void sendResponse(in int serverIf, in String address, in int requestId,

                            in int status, in int offset, in byte[] value);

                            in int status, in int offset, in byte[] value, in AttributionSource attributionSource);

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

    void sendNotification(in int serverIf, in String address, in int handle,

                            in boolean confirm, in byte[] value);

                            in boolean confirm, in byte[] value, in AttributionSource attributionSource);

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

    void disconnectAll();

    void disconnectAll(in AttributionSource attributionSource);

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

    void unregAll();

    void unregAll(in AttributionSource attributionSource);

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

    int numHwTrackFiltersAvailable();

    int numHwTrackFiltersAvailable(in AttributionSource attributionSource);

}