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

Commit 7eff9ef7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Pipe featureId from app to noteOp in BT code"

parents 2d064031 6b5b33f0

system/binder/android/bluetooth/IBluetooth.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ interface IBluetooth 
    int getDiscoverableTimeout();

    int getDiscoverableTimeout();

    boolean setDiscoverableTimeout(int timeout);

    boolean setDiscoverableTimeout(int timeout);





    boolean startDiscovery(String callingPackage);

    boolean startDiscovery(String callingPackage, String callingFeatureId);

    boolean cancelDiscovery();

    boolean cancelDiscovery();

    boolean isDiscovering();

    boolean isDiscovering();

    long getDiscoveryEndMillis();

    long getDiscoveryEndMillis();

system/binder/android/bluetooth/IBluetoothGatt.aidl

+2 −2
Original line number Original line Diff line number Diff line
@@ -46,9 +46,9 @@ interface IBluetoothGatt { 
    void registerScanner(in IScannerCallback callback, in WorkSource workSource);

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

    void unregisterScanner(in int scannerId);

    void unregisterScanner(in int scannerId);

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

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

                   in List scanStorages, in String callingPackage);

                   in List scanStorages, in String callingPackage, String callingFeatureId);

    void startScanForIntent(in PendingIntent intent, in ScanSettings settings, in List<ScanFilter> filters,

    void startScanForIntent(in PendingIntent intent, in ScanSettings settings, in List<ScanFilter> filters,

                            in String callingPackage);

                            in String callingPackage, String callingFeatureId);

    void stopScanForIntent(in PendingIntent intent, in String callingPackage);

    void stopScanForIntent(in PendingIntent intent, in String callingPackage);

    void stopScan(in int scannerId);

    void stopScan(in int scannerId);

    void flushPendingBatchResults(in int scannerId);

    void flushPendingBatchResults(in int scannerId);