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

Commit 913ea0a1 authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Android (Google) Code Review
Browse files

Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" into stage-aosp-master

parents 17da84da ce1d2e1f

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -2017,7 +2017,10 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean connect(android.bluetooth.BluetoothDevice);

    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 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, 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();

  }















  public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {

























core/java/android/bluetooth/BluetoothHeadset.java



+6
−6




























Original line number
Diff line number
Diff line








@@ -16,17 +16,16 @@





























package android.bluetooth;





























import android.Manifest;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.SdkConstant;













import android.annotation.SuppressLint;















import android.annotation.SdkConstant.SdkConstantType;













import android.annotation.SuppressLint;













import android.annotation.SystemApi;















import android.bluetooth.annotations.RequiresBluetoothConnectPermission;















import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;















import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;













import android.annotation.SystemApi;















import android.compat.annotation.UnsupportedAppUsage;















import android.content.Attributable;















import android.content.AttributionSource;










@@ -1105,13 +1104,13 @@ public final class BluetoothHeadset implements BluetoothProfile {













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















     * @hide















     */













    @SystemApi















    @RequiresLegacyBluetoothAdminPermission















    @RequiresBluetoothConnectPermission















    @RequiresPermission(allOf = {















            android.Manifest.permission.BLUETOOTH_CONNECT,















            android.Manifest.permission.MODIFY_PHONE_STATE,















    })













    @UnsupportedAppUsage















    public boolean startScoUsingVirtualVoiceCall() {















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















        final IBluetoothHeadset service = mService;










@@ -1140,13 +1139,13 @@ public final class BluetoothHeadset implements BluetoothProfile {













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















     * @hide















     */













    @SystemApi















    @RequiresLegacyBluetoothAdminPermission















    @RequiresBluetoothConnectPermission















    @RequiresPermission(allOf = {















            android.Manifest.permission.BLUETOOTH_CONNECT,















            android.Manifest.permission.MODIFY_PHONE_STATE,















    })













    @UnsupportedAppUsage















    public boolean stopScoUsingVirtualVoiceCall() {















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















        final IBluetoothHeadset service = mService;










@@ -1343,9 +1342,10 @@ public final class BluetoothHeadset implements BluetoothProfile {













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















     * @hide















     */













    @SystemApi















    @RequiresLegacyBluetoothPermission















    @RequiresBluetoothConnectPermission













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean isInbandRingingEnabled() {















        if (DBG) {















            log("isInbandRingingEnabled()");