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

Commit c9370503 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "remove_flag_1" into main am: 02c402cd

parents 98250e00 02c402cd
Loading
Loading
Loading
Loading
+0 −16
Original line number Diff line number Diff line
@@ -67,22 +67,6 @@ flag {
    bug: "322387487"
}

flag {
    name: "leaudio_add_sampling_frequencies"
    is_exported: true
    namespace: "bluetooth"
    description: "Adds missing frequencies defined by the Bluetooth SIG"
    bug: "323287937"
}

flag {
    name: "leaudio_callback_on_group_stream_status"
    is_exported: true
    namespace: "bluetooth"
    description: "Add group stream status callback to notify about playing state"
    bug: "323288608"
}

flag {
    name: "leaudio_multiple_vocs_instances_api"
    is_exported: true
+7 −7
Original line number Diff line number Diff line
@@ -977,19 +977,19 @@ package android.bluetooth {
    field public static final int FRAME_DURATION_10000 = 2; // 0x2
    field public static final int FRAME_DURATION_7500 = 1; // 0x1
    field public static final int FRAME_DURATION_NONE = 0; // 0x0
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_add_sampling_frequencies") public static final int SAMPLE_RATE_11025 = 2; // 0x2
    field public static final int SAMPLE_RATE_11025 = 2; // 0x2
    field public static final int SAMPLE_RATE_16000 = 4; // 0x4
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_add_sampling_frequencies") public static final int SAMPLE_RATE_176400 = 1024; // 0x400
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_add_sampling_frequencies") public static final int SAMPLE_RATE_192000 = 2048; // 0x800
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_add_sampling_frequencies") public static final int SAMPLE_RATE_22050 = 8; // 0x8
    field public static final int SAMPLE_RATE_176400 = 1024; // 0x400
    field public static final int SAMPLE_RATE_192000 = 2048; // 0x800
    field public static final int SAMPLE_RATE_22050 = 8; // 0x8
    field public static final int SAMPLE_RATE_24000 = 16; // 0x10
    field public static final int SAMPLE_RATE_32000 = 32; // 0x20
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_add_sampling_frequencies") public static final int SAMPLE_RATE_384000 = 4096; // 0x1000
    field public static final int SAMPLE_RATE_384000 = 4096; // 0x1000
    field public static final int SAMPLE_RATE_44100 = 64; // 0x40
    field public static final int SAMPLE_RATE_48000 = 128; // 0x80
    field public static final int SAMPLE_RATE_8000 = 1; // 0x1
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_add_sampling_frequencies") public static final int SAMPLE_RATE_88200 = 256; // 0x100
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_add_sampling_frequencies") public static final int SAMPLE_RATE_96000 = 512; // 0x200
    field public static final int SAMPLE_RATE_88200 = 256; // 0x100
    field public static final int SAMPLE_RATE_96000 = 512; // 0x200
    field public static final int SAMPLE_RATE_NONE = 0; // 0x0
    field public static final int SOURCE_CODEC_TYPE_INVALID = 1000000; // 0xf4240
    field public static final int SOURCE_CODEC_TYPE_LC3 = 0; // 0x0
+3 −3
Original line number Diff line number Diff line
@@ -496,8 +496,8 @@ package android.bluetooth {
    field public static final int AUDIO_LOCATION_TOP_SIDE_LEFT = 262144; // 0x40000
    field public static final int AUDIO_LOCATION_TOP_SIDE_RIGHT = 524288; // 0x80000
    field public static final String EXTRA_LE_AUDIO_GROUP_ID = "android.bluetooth.extra.LE_AUDIO_GROUP_ID";
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_callback_on_group_stream_status") public static final int GROUP_STREAM_STATUS_IDLE = 0; // 0x0
    field @FlaggedApi("com.android.bluetooth.flags.leaudio_callback_on_group_stream_status") public static final int GROUP_STREAM_STATUS_STREAMING = 1; // 0x1
    field public static final int GROUP_STREAM_STATUS_IDLE = 0; // 0x0
    field public static final int GROUP_STREAM_STATUS_STREAMING = 1; // 0x1
  }

  public static interface BluetoothLeAudio.Callback {
@@ -505,7 +505,7 @@ package android.bluetooth {
    method public void onGroupNodeAdded(@NonNull android.bluetooth.BluetoothDevice, int);
    method public void onGroupNodeRemoved(@NonNull android.bluetooth.BluetoothDevice, int);
    method public void onGroupStatusChanged(int, int);
    method @FlaggedApi("com.android.bluetooth.flags.leaudio_callback_on_group_stream_status") public default void onGroupStreamStatusChanged(int, int);
    method public default void onGroupStreamStatusChanged(int, int);
  }

  public final class BluetoothLeAudioCodecConfigMetadata implements android.os.Parcelable {
+2 −10
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;
import static java.util.Objects.requireNonNull;

import android.annotation.CallbackExecutor;
import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
@@ -44,8 +43,6 @@ import android.os.RemoteException;
import android.util.CloseGuard;
import android.util.Log;

import com.android.bluetooth.flags.Flags;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Collections;
@@ -145,7 +142,6 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
         * @param groupStreamStatus streaming or idle state.
         * @hide
         */
        @FlaggedApi(Flags.FLAG_LEAUDIO_CALLBACK_ON_GROUP_STREAM_STATUS)
        @SystemApi
        default void onGroupStreamStatusChanged(
                int groupId, @GroupStreamStatus int groupStreamStatus) {
@@ -184,12 +180,10 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {

        @Override
        public void onGroupStreamStatusChanged(int groupId, int groupStreamStatus) {
            if (Flags.leaudioCallbackOnGroupStreamStatus()) {
            mCallbackWrapper.forEach(
                    (cb) -> cb.onGroupStreamStatusChanged(groupId, groupStreamStatus));
        }
    }
    }

    /**
     * Intent used to broadcast the change in connection state of the LeAudio profile. Please note
@@ -657,7 +651,6 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
     *
     * @hide
     */
    @FlaggedApi(Flags.FLAG_LEAUDIO_CALLBACK_ON_GROUP_STREAM_STATUS)
    @SystemApi
    public static final int GROUP_STREAM_STATUS_IDLE = IBluetoothLeAudio.GROUP_STREAM_STATUS_IDLE;

@@ -666,7 +659,6 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
     *
     * @hide
     */
    @FlaggedApi(Flags.FLAG_LEAUDIO_CALLBACK_ON_GROUP_STREAM_STATUS)
    @SystemApi
    public static final int GROUP_STREAM_STATUS_STREAMING =
            IBluetoothLeAudio.GROUP_STREAM_STATUS_STREAMING;
+0 −7
Original line number Diff line number Diff line
@@ -103,14 +103,12 @@ public final class BluetoothLeAudioCodecConfig implements Parcelable {
    public static final int SAMPLE_RATE_8000 = 0x01 << 0;

    /** Codec sample rate 11025 Hz. */
    @FlaggedApi(Flags.FLAG_LEAUDIO_ADD_SAMPLING_FREQUENCIES)
    public static final int SAMPLE_RATE_11025 = 0x01 << 1;

    /** Codec sample rate 16000 Hz. */
    public static final int SAMPLE_RATE_16000 = 0x01 << 2;

    /** Codec sample rate 22050 Hz. */
    @FlaggedApi(Flags.FLAG_LEAUDIO_ADD_SAMPLING_FREQUENCIES)
    public static final int SAMPLE_RATE_22050 = 0x01 << 3;

    /** Codec sample rate 24000 Hz. */
@@ -126,23 +124,18 @@ public final class BluetoothLeAudioCodecConfig implements Parcelable {
    public static final int SAMPLE_RATE_48000 = 0x01 << 7;

    /** Codec sample rate 88200 Hz. */
    @FlaggedApi(Flags.FLAG_LEAUDIO_ADD_SAMPLING_FREQUENCIES)
    public static final int SAMPLE_RATE_88200 = 0x01 << 8;

    /** Codec sample rate 96000 Hz. */
    @FlaggedApi(Flags.FLAG_LEAUDIO_ADD_SAMPLING_FREQUENCIES)
    public static final int SAMPLE_RATE_96000 = 0x01 << 9;

    /** Codec sample rate 176400 Hz. */
    @FlaggedApi(Flags.FLAG_LEAUDIO_ADD_SAMPLING_FREQUENCIES)
    public static final int SAMPLE_RATE_176400 = 0x01 << 10;

    /** Codec sample rate 192000 Hz. */
    @FlaggedApi(Flags.FLAG_LEAUDIO_ADD_SAMPLING_FREQUENCIES)
    public static final int SAMPLE_RATE_192000 = 0x01 << 11;

    /** Codec sample rate 384000 Hz. */
    @FlaggedApi(Flags.FLAG_LEAUDIO_ADD_SAMPLING_FREQUENCIES)
    public static final int SAMPLE_RATE_384000 = 0x01 << 12;

    /** @hide */
Loading