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

Commit 56c32615 authored by Sal Savage's avatar Sal Savage Committed by Android (Google) Code Review
Browse files

Merge "Remove newly introduced audio state APIs that shouldn't be public" into tm-dev

parents 7bb0758b 1835c355

framework/api/system-current.txt

+0 −4
Original line number Original line Diff line number Diff line
@@ -330,13 +330,9 @@ package android.bluetooth { 
    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.BluetoothHeadsetClient.NetworkServiceState getNetworkServiceState(@NonNull android.bluetooth.BluetoothDevice);

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.BluetoothHeadsetClient.NetworkServiceState getNetworkServiceState(@NonNull android.bluetooth.BluetoothDevice);

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

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

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_AUDIO_STATE_CHANGED = "android.bluetooth.headsetclient.profile.action.AUDIO_STATE_CHANGED";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.headsetclient.profile.action.CONNECTION_STATE_CHANGED";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.headsetclient.profile.action.CONNECTION_STATE_CHANGED";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_NETWORK_SERVICE_STATE_CHANGED = "android.bluetooth.headsetclient.profile.action.NETWORK_SERVICE_STATE_CHANGED";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_NETWORK_SERVICE_STATE_CHANGED = "android.bluetooth.headsetclient.profile.action.NETWORK_SERVICE_STATE_CHANGED";

    field public static final String EXTRA_NETWORK_SERVICE_STATE = "android.bluetooth.headsetclient.extra.EXTRA_NETWORK_SERVICE_STATE";

    field public static final String EXTRA_NETWORK_SERVICE_STATE = "android.bluetooth.headsetclient.extra.EXTRA_NETWORK_SERVICE_STATE";

    field public static final int STATE_AUDIO_CONNECTED = 2; // 0x2

    field public static final int STATE_AUDIO_CONNECTING = 1; // 0x1

    field public static final int STATE_AUDIO_DISCONNECTED = 0; // 0x0

  }

  }





  public static final class BluetoothHeadsetClient.NetworkServiceState implements android.os.Parcelable {

  public static final class BluetoothHeadsetClient.NetworkServiceState implements android.os.Parcelable {

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -104,7 +104,6 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
     *

     *

     * @hide

     * @hide

     */

     */

    @SystemApi

    @RequiresBluetoothConnectPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
@@ -198,19 +197,16 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
    /**

    /**

     * @hide

     * @hide

     */

     */

    @SystemApi

    public static final int STATE_AUDIO_DISCONNECTED = 0;

    public static final int STATE_AUDIO_DISCONNECTED = 0;





    /**

    /**

     * @hide

     * @hide

     */

     */

    @SystemApi

    public static final int STATE_AUDIO_CONNECTING = 1;

    public static final int STATE_AUDIO_CONNECTING = 1;





    /**

    /**

     * @hide

     * @hide

     */

     */

    @SystemApi

    public static final int STATE_AUDIO_CONNECTED = 2;

    public static final int STATE_AUDIO_CONNECTED = 2;





    /**

    /**