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

Commit b85745f1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Pipe featureId from app to noteOp in BT code" am: 7eff9ef7 am: 310610d2 am: 4227ad42 

Change-Id: I128026cd4578ea8df659cd96de7ef7454cc3a4a0
parents e5b337ee 4227ad42

system/binder/android/bluetooth/IBluetooth.aidl

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

    boolean setDiscoverableTimeout(int timeout);



    boolean startDiscovery(String callingPackage);

    boolean startDiscovery(String callingPackage, String callingFeatureId);

    boolean cancelDiscovery();

    boolean isDiscovering();

    long getDiscoveryEndMillis();

system/binder/android/bluetooth/IBluetoothGatt.aidl

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

    void unregisterScanner(in int scannerId);

    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,

                            in String callingPackage);

                            in String callingPackage, String callingFeatureId);

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

    void stopScan(in int scannerId);

    void flushPendingBatchResults(in int scannerId);