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

Commit 66ecd20d authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "[API Review] add new permissions to sco and inband ringing" am: e75cf65b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1999719

Change-Id: I463bd97248b1cf12cfb6d5dd6c087267107af5fb
parents 5b3c6ac8 e75cf65b

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

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

                boolean defaultValue = false;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.startScoUsingVirtualVoiceCall();

                }

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

                boolean defaultValue = false;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.stopScoUsingVirtualVoiceCall();

                }

                receiver.send(defaultValue);

framework/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ package android.bluetooth { 
    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

+2 −0
Original line number Diff line number Diff line
@@ -1236,6 +1236,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()");
@@ -1274,6 +1275,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()");