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

Commit bda9c9f2 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android Git Automerger
Browse files

am a1790304: Do not return devices when caller has no location permission 

* commit 'a1790304':
  Do not return devices when caller has no location permission
parents bf8cc192 a1790304

core/java/android/bluetooth/IBluetoothGatt.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/java/android/bluetooth/le/BluetoothLeScanner.java

+2 −1
Original line number Diff line number Diff line
@@ -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;