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

Commit e9e618b5 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev am: 73971b2a43 

am: 2b9e3858

Change-Id: Id38a953fb7012af08dc28cfd28aeb2bcc6d2ba2e
parents 8bdafd74 2b9e3858

framework/java/android/bluetooth/IBluetoothGatt.aidl

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ import android.bluetooth.le.IScannerCallback; 
interface IBluetoothGatt {

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



    void registerScanner(in IScannerCallback callback);

    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 WorkSource workSource, in List scanStorages, in String callingPackage);

                   in List scanStorages, in String callingPackage);

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

                            in String callingPackage);

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

framework/java/android/bluetooth/le/BluetoothLeScanner.java

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ public final class BluetoothLeScanner { 
                // Scan stopped.

                if (mScannerId == -1) return;

                try {

                    mBluetoothGatt.registerScanner(this);

                    mBluetoothGatt.registerScanner(this, mWorkSource);

                    wait(REGISTRATION_CALLBACK_TIMEOUT_MILLIS);

                } catch (InterruptedException | RemoteException e) {

                    Log.e(TAG, "application registeration exception", e);
@@ -424,7 +424,7 @@ public final class BluetoothLeScanner { 
                        } else {

                            mScannerId = scannerId;

                            mBluetoothGatt.startScan(mScannerId, mSettings, mFilters,

                                    mWorkSource, mResultStorages,

                                    mResultStorages,

                                    ActivityThread.currentOpPackageName());

                        }

                    } catch (RemoteException e) {