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

Commit fb01e8f1 authored by Alice Kuo's avatar Alice Kuo
Browse files

Change AUDIO_LOCATION_INVALID to be systemApi 

Ignore-AOSP-First: resolve merge conflict
Bug: 216554758
Test: make build
Change-Id: If029eda8c4f447b52e68034d54bc2ac0e1df3ca2
parent 2eaaea5b

framework/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ package android.bluetooth { 
    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED = "android.bluetooth.action.LE_AUDIO_ACTIVE_DEVICE_CHANGED";

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

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static final String ACTION_LE_AUDIO_GROUP_STATUS_CHANGED = "android.bluetooth.action.LE_AUDIO_GROUP_STATUS_CHANGED";

    field public static final int AUDIO_LOCATION_INVALID = -1; // 0xffffffff

    field public static final String EXTRA_LE_AUDIO_GROUP_ID = "android.bluetooth.extra.LE_AUDIO_GROUP_ID";

    field public static final String EXTRA_LE_AUDIO_GROUP_NODE_STATUS = "android.bluetooth.extra.LE_AUDIO_GROUP_NODE_STATUS";

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

framework/java/android/bluetooth/BluetoothLeAudio.java

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { 
     *

     * @hide

     */

    @SystemApi

    public static final int AUDIO_LOCATION_INVALID = -1;



    /**