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

Commit c7223df6 authored by William Escande's avatar William Escande
Browse files

Flag hap client api 

Test: m Bluetooth | no-op change build only is required
Bug: 300015207
Bug: 306236481
Change-Id: I8dddc4481779e1d7e12c879f2e39767978f18b87
parent 66b4d07e

flags/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ aconfig_declarations { 
    name: "bluetooth_aconfig_flags",

    package: "com.android.bluetooth.flags",

    srcs: [

        "hap.aconfig",

        "hfp.aconfig",

        "system_service.aconfig",

    ],

flags/hap.aconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"



flag {

    name: "settings_can_control_hap_preset"

    namespace: "bluetooth"

    description: "Allow user to control the preset of hearing aid devices"

    bug: "306236481"

}

framework/api/system-current.txt

+8 −8
Original line number Diff line number Diff line
@@ -295,16 +295,16 @@ package android.bluetooth { 
  public final class BluetoothHapClient implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {

    method public void close();

    method protected void finalize();

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

    method @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getActivePresetIndex(@NonNull android.bluetooth.BluetoothDevice);

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

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

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

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

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

    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 @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getHapGroup(@NonNull android.bluetooth.BluetoothDevice);

    method @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getHapGroup(@NonNull android.bluetooth.BluetoothDevice);

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

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

    method @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.BluetoothHapPresetInfo getPresetInfo(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothHapClient.Callback);

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

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void selectPresetForGroup(int, int);
@@ -315,13 +315,13 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean supportsIndependentPresets(@NonNull android.bluetooth.BluetoothDevice);

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

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

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

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

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

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

    method @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void switchToNextPreset(@NonNull android.bluetooth.BluetoothDevice);

    method @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void switchToNextPresetForGroup(int);

    method @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void switchToPreviousPreset(@NonNull android.bluetooth.BluetoothDevice);

    method @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void switchToPreviousPresetForGroup(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void unregisterCallback(@NonNull android.bluetooth.BluetoothHapClient.Callback);

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

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

    field @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset") public static final int PRESET_INDEX_UNAVAILABLE = 0; // 0x0

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

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

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

framework/java/android/bluetooth/BluetoothHapClient.java

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android.bluetooth; 
import static android.bluetooth.BluetoothUtils.getSyncTimeout;



import android.annotation.CallbackExecutor;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -404,6 +405,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    public static final int PRESET_INDEX_UNAVAILABLE = IBluetoothHapClient.PRESET_INDEX_UNAVAILABLE;



    /**
@@ -865,6 +867,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {
@@ -899,6 +902,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {
@@ -1040,6 +1044,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {
@@ -1073,6 +1078,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {
@@ -1103,6 +1109,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {
@@ -1136,6 +1143,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {
@@ -1165,6 +1173,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
     * @hide

     */

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.settings_can_control_hap_preset")

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {