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

Commit 2ef5e10f authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Gerrit Code Review
Browse files

Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi"

parents a78fa61b 943ac64f

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -1575,7 +1575,10 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean connect(android.bluetooth.BluetoothDevice);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(android.bluetooth.BluetoothDevice);

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

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

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

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean startScoUsingVirtualVoiceCall();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean stopScoUsingVirtualVoiceCall();

  }















  public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {

































core/java/android/bluetooth/BluetoothHeadset.java



+4
−3




























Original line number
Diff line number
Diff line








@@ -1018,8 +1018,8 @@ public final class BluetoothHeadset implements BluetoothProfile {













     *  - binder is dead or Bluetooth is disabled or other error















     * @hide















     */













    @SystemApi















    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)













    @UnsupportedAppUsage















    public boolean startScoUsingVirtualVoiceCall() {















        if (DBG) log("startScoUsingVirtualVoiceCall()");















        final IBluetoothHeadset service = mService;










@@ -1048,8 +1048,8 @@ public final class BluetoothHeadset implements BluetoothProfile {













     *  - binder is dead or Bluetooth is disabled or other error















     * @hide















     */













    @SystemApi















    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)













    @UnsupportedAppUsage















    public boolean stopScoUsingVirtualVoiceCall() {















        if (DBG) log("stopScoUsingVirtualVoiceCall()");















        final IBluetoothHeadset service = mService;










@@ -1227,7 +1227,8 @@ public final class BluetoothHeadset implements BluetoothProfile {













     * @return true if in-band ringing is enabled, false if in-band ringing is disabled















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH)













    @SystemApi













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean isInbandRingingEnabled() {















        if (DBG) {















            log("isInbandRingingEnabled()");