diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-09 23:29:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 23:29:44 +0000 |
| commit | be5494eee4dc3d75daa7e6333772f32fd177f154 (patch) | |
| tree | 997ef7898405c260f4aeaa1b1ace12af80de4c03 /core/java/android | |
| parent | 8bbd9ac7460ea36ddd7b90213c914ba06967349d (diff) | |
| parent | 25864da0bccd37ecd26c6e2ffe474a338af544ca (diff) | |
am 25864da0: am 9f73cd92: am 1e4be401: am bda9c9f2: am a1790304: Do not return devices when caller has no location permission
* commit '25864da0bccd37ecd26c6e2ffe474a338af544ca':
Do not return devices when caller has no location permission
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/IBluetoothGatt.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/bluetooth/le/BluetoothLeScanner.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/IBluetoothGatt.aidl b/core/java/android/bluetooth/IBluetoothGatt.aidl index 72abeaf699c1..3660be7c8eb5 100644 --- a/core/java/android/bluetooth/IBluetoothGatt.aidl +++ b/core/java/android/bluetooth/IBluetoothGatt.aidl @@ -36,7 +36,7 @@ interface IBluetoothGatt { void startScan(in int appIf, in boolean isServer, in ScanSettings settings, in List<ScanFilter> filters, - in List scanStorages); + in List scanStorages, in String callingPackage); void stopScan(in int appIf, in boolean isServer); void flushPendingBatchResults(in int appIf, in boolean isServer); void startMultiAdvertising(in int appIf, diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java index 2e6c4f03d8b2..e09ab5676de7 100644 --- a/core/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java @@ -19,6 +19,7 @@ package android.bluetooth.le; import android.Manifest; import android.annotation.RequiresPermission; import android.annotation.SystemApi; +import android.app.ActivityThread; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCallbackWrapper; @@ -313,7 +314,7 @@ public final class BluetoothLeScanner { mClientIf = clientIf; try { mBluetoothGatt.startScan(mClientIf, false, mSettings, mFilters, - mResultStorages); + mResultStorages, ActivityThread.currentOpPackageName()); } catch (RemoteException e) { Log.e(TAG, "fail to start le scan: " + e); mClientIf = -1; |