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

Commit b271d27d authored by Etan Cohen's avatar Etan Cohen
Browse files

Merge commit 'db1dbb88' into merge2

parents f9465fb6 db1dbb88

core/java/android/bluetooth/BluetoothAdapter.java

+5 −2
Original line number Diff line number Diff line
@@ -1307,9 +1307,12 @@ public final class BluetoothAdapter { 
    public boolean isHardwareTrackingFiltersAvailable() {

        if (getState() != STATE_ON) return false;

        try {

            synchronized(mManagerCallback) {

                if(mService != null) return (mService.numOfHwTrackFiltersAvailable() != 0);

            IBluetoothGatt iGatt = mManagerService.getBluetoothGatt();

            if (iGatt == null) {

                // BLE is not supported

                return false;

            }

            return (iGatt.numHwTrackFiltersAvailable() != 0);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        }

core/java/android/bluetooth/BluetoothGattCallbackWrapper.java

+3 −0
Original line number Diff line number Diff line
@@ -123,4 +123,7 @@ public class BluetoothGattCallbackWrapper extends IBluetoothGattCallback.Stub { 
    public void onFoundOrLost(boolean onFound, ScanResult scanResult) throws RemoteException {

    }



    @Override

    public void onScanManagerErrorCallback(int errorCode) throws RemoteException {

    }

}

core/java/android/bluetooth/IBluetooth.aidl

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ interface IBluetooth 
    boolean isActivityAndEnergyReportingSupported();

    void getActivityEnergyInfoFromController();

    BluetoothActivityEnergyInfo reportActivityInfo();

    int numOfHwTrackFiltersAvailable();



    // for dumpsys support

    String dump();

core/java/android/bluetooth/IBluetoothGatt.aidl

+1 −0
Original line number Diff line number Diff line
@@ -103,4 +103,5 @@ interface IBluetoothGatt { 
                            in boolean confirm, in byte[] value);

    void disconnectAll();

    void unregAll();

    int numHwTrackFiltersAvailable();

}

core/java/android/bluetooth/IBluetoothGattCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ oneway interface IBluetoothGattCallback { 
    void onReadRemoteRssi(in String address, in int rssi, in int status);

    void onMultiAdvertiseCallback(in int status, boolean isStart,

                                  in AdvertiseSettings advertiseSettings);

    void onScanManagerErrorCallback(in int errorCode);

    void onConfigureMTU(in String address, in int mtu, in int status);

    void onFoundOrLost(in boolean onFound, in ScanResult scanResult);

}