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

Commit db201e54 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Replace priority with connectionPolicy in aidl" am: db1d4025 am: 5990d40d 

Change-Id: Iacccabf22dc7052249ebbdc5dc8f7cd23af45fa7
parents 90ddf8ad 5990d40d

system/binder/android/bluetooth/IBluetoothA2dp.aidl

+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ interface IBluetoothA2dp { 
    int getConnectionState(in BluetoothDevice device);

    boolean setActiveDevice(in BluetoothDevice device);

    BluetoothDevice getActiveDevice();

    boolean setPriority(in BluetoothDevice device, int priority);

    @UnsupportedAppUsage

    int getPriority(in BluetoothDevice device);

    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);

    int getConnectionPolicy(in BluetoothDevice device);

    boolean isAvrcpAbsoluteVolumeSupported();

    oneway void setAvrcpAbsoluteVolume(int volume);

    boolean isA2dpPlaying(in BluetoothDevice device);

system/binder/android/bluetooth/IBluetoothA2dpSink.aidl

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ interface IBluetoothA2dpSink { 
    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);

    int getConnectionState(in BluetoothDevice device);

    BluetoothAudioConfig getAudioConfig(in BluetoothDevice device);

    boolean setPriority(in BluetoothDevice device, int priority);

    int getPriority(in BluetoothDevice device);

    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);

    int getConnectionPolicy(in BluetoothDevice device);

    boolean isA2dpPlaying(in BluetoothDevice device);

}

system/binder/android/bluetooth/IBluetoothHeadset.aidl

+2 −4
Original line number Diff line number Diff line
@@ -46,10 +46,8 @@ interface IBluetoothHeadset { 
    boolean connect(in BluetoothDevice device);

    @UnsupportedAppUsage

    boolean disconnect(in BluetoothDevice device);

    @UnsupportedAppUsage

    boolean setPriority(in BluetoothDevice device, int priority);

    @UnsupportedAppUsage

    int getPriority(in BluetoothDevice device);

    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);

    int getConnectionPolicy(in BluetoothDevice device);

    int getAudioState(in BluetoothDevice device);

    boolean isAudioOn();

    boolean connectAudio();

system/binder/android/bluetooth/IBluetoothHeadsetClient.aidl

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ interface IBluetoothHeadsetClient { 
    List<BluetoothDevice> getConnectedDevices();

    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);

    int getConnectionState(in BluetoothDevice device);

    boolean setPriority(in BluetoothDevice device, int priority);

    int getPriority(in BluetoothDevice device);

    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);

    int getConnectionPolicy(in BluetoothDevice device);



    boolean startVoiceRecognition(in BluetoothDevice device);

    boolean stopVoiceRecognition(in BluetoothDevice device);

system/binder/android/bluetooth/IBluetoothHearingAid.aidl

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ interface IBluetoothHearingAid { 
    int getConnectionState(in BluetoothDevice device);

    boolean setActiveDevice(in BluetoothDevice device);

    List<BluetoothDevice> getActiveDevices();

    boolean setPriority(in BluetoothDevice device, int priority);

    int getPriority(in BluetoothDevice device);

    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);

    int getConnectionPolicy(in BluetoothDevice device);

    void adjustVolume(int direction);

    void setVolume(int volume);

    int getVolume();