Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 73971b2a43

Change-Id: I899cf09b716c4b28c829f96e15760a897d45e293
This commit is contained in:
Ajay Panicker
2017-05-05 18:55:41 +00:00
committed by android-build-merger
parent 3c9e0d4232 73971b2a43
commit 8ddad99cd1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/IBluetoothGatt.aidl
View File

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

4
core/java/android/bluetooth/le/BluetoothLeScanner.java
View File

@@ -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) {