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

Commit 853e3e50 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739 

am: 6fe3900791

Change-Id: I8e04aa89379c4a50031fade065c288fd1cc30668
parents 17d132de d5e99a96

framework/java/android/bluetooth/BluetoothDevice.java

+8 −0
Original line number Diff line number Diff line
@@ -895,6 +895,14 @@ public final class BluetoothDevice implements Parcelable { 
        return false;

    }



    /** @hide */

    public boolean isBondingInitiatedLocally() {

        try {

            return sService.isBondingInitiatedLocally(this);

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return false;

    }



    /**

     * Set the Out Of Band data for a remote device to be used later

     * in the pairing mechanism. Users can obtain this data through other

framework/java/android/bluetooth/IBluetooth.aidl

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ interface IBluetooth 
    boolean cancelBondProcess(in BluetoothDevice device);

    boolean removeBond(in BluetoothDevice device);

    int getBondState(in BluetoothDevice device);

    boolean isBondingInitiatedLocally(in BluetoothDevice device);

    int getConnectionState(in BluetoothDevice device);



    String getRemoteName(in BluetoothDevice device);