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

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

am b593b40b: am 3d7dd623: Merge "Require ACCESS_COARSE_LOCATION for... 

am b593b40b: am 3d7dd623: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev

* commit 'b593b40b':
  Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
parents 5a198b67 b593b40b

src/com/android/bluetooth/btservice/RemoteDevices.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -313,11 +313,13 @@ final class RemoteDevices { 
        Intent intent = new Intent(BluetoothDevice.ACTION_FOUND);

        Intent intent = new Intent(BluetoothDevice.ACTION_FOUND);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

        intent.putExtra(BluetoothDevice.EXTRA_CLASS,

        intent.putExtra(BluetoothDevice.EXTRA_CLASS,

                new BluetoothClass(Integer.valueOf(deviceProp.mBluetoothClass)));

                new BluetoothClass(deviceProp.mBluetoothClass));

        intent.putExtra(BluetoothDevice.EXTRA_RSSI, deviceProp.mRssi);

        intent.putExtra(BluetoothDevice.EXTRA_RSSI, deviceProp.mRssi);

        intent.putExtra(BluetoothDevice.EXTRA_NAME, deviceProp.mName);

        intent.putExtra(BluetoothDevice.EXTRA_NAME, deviceProp.mName);





        mAdapterService.sendBroadcast(intent, mAdapterService.BLUETOOTH_PERM);

        mAdapterService.sendBroadcastMultiplePermissions(intent,

                new String[] {AdapterService.BLUETOOTH_PERM,

                        android.Manifest.permission.ACCESS_COARSE_LOCATION});

    }

    }





    void aclStateChangeCallback(int status, byte[] address, int newState) {

    void aclStateChangeCallback(int status, byte[] address, int newState) {