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

Commit 88fba38a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission"

parents cc89e592 eaa088f1

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -1296,10 +1296,10 @@ package android.bluetooth { 














  public final class BluetoothA2dpSink implements android.bluetooth.BluetoothProfile {















    method public void finalize();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean isAudioPlaying(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice, int);













    field @RequiresPermission(android.Manifest.permission.BLUETOOTH) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED";













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isAudioPlaying(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice, int);













    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED";















  }





























  public final class BluetoothAdapter {

































core/java/android/bluetooth/BluetoothA2dpSink.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -66,7 +66,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile {













     */















    @SystemApi















    @SuppressLint("ActionValue")













    @RequiresPermission(Manifest.permission.BLUETOOTH)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public static final String ACTION_CONNECTION_STATE_CHANGED =















            "android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED";


























@@ -296,7 +296,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile {













     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean setConnectionPolicy(@Nullable BluetoothDevice device,















            @ConnectionPolicy int connectionPolicy) {















        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");










@@ -345,7 +345,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile {













     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public @ConnectionPolicy int getConnectionPolicy(@Nullable BluetoothDevice device) {















        if (VDBG) log("getConnectionPolicy(" + device + ")");















        final IBluetoothA2dpSink service = getService();









@@ -370,7 +370,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile {













     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean isAudioPlaying(@Nullable BluetoothDevice device) {















        final IBluetoothA2dpSink service = getService();















        if (service != null && isEnabled() && isValidDevice(device)) {