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

Commit b5ae5d30 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

[API Review] add new permissions to sco and inband ringing 

Bug: 200730908
Tag: #feature
Test: manual
Change-Id: I0a0915925b16cb53c3bf77fe47871ede6e752cdb
parent fcc1bce4

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+3 −0
Original line number Diff line number Diff line
@@ -795,6 +795,7 @@ public class HeadsetService extends ProfileService { 
                HeadsetService service = getService(source);

                boolean defaultValue = false;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.startScoUsingVirtualVoiceCall();

                }

                receiver.send(defaultValue);
@@ -810,6 +811,7 @@ public class HeadsetService extends ProfileService { 
                HeadsetService service = getService(source);

                boolean defaultValue = false;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.stopScoUsingVirtualVoiceCall();

                }

                receiver.send(defaultValue);
@@ -893,6 +895,7 @@ public class HeadsetService extends ProfileService { 
                HeadsetService service = getService(source);

                boolean defaultValue = false;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.isInbandRingingEnabled();

                }

                receiver.send(defaultValue);

framework/api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -303,11 +303,11 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disconnect(android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getAudioRouteAllowed();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isInbandRingingEnabled();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isInbandRingingEnabled();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int setAudioRouteAllowed(boolean);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean startScoUsingVirtualVoiceCall();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean stopScoUsingVirtualVoiceCall();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean startScoUsingVirtualVoiceCall();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean stopScoUsingVirtualVoiceCall();

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.headset.profile.action.ACTIVE_DEVICE_CHANGED";

  }

framework/java/android/bluetooth/BluetoothHeadset.java

+6 −1
Original line number Diff line number Diff line
@@ -1205,6 +1205,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.MODIFY_PHONE_STATE,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean startScoUsingVirtualVoiceCall() {

        if (DBG) log("startScoUsingVirtualVoiceCall()");
@@ -1243,6 +1244,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.MODIFY_PHONE_STATE,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean stopScoUsingVirtualVoiceCall() {

        if (DBG) log("stopScoUsingVirtualVoiceCall()");
@@ -1457,7 +1459,10 @@ public final class BluetoothHeadset implements BluetoothProfile { 
    @SystemApi

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean isInbandRingingEnabled() {

        if (DBG) log("isInbandRingingEnabled()");

        final IBluetoothHeadset service = mService;