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

Commit a9630706 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Make the BLUETOOTH_STACK permission a module-lib API."

parents 11d4dacf 18ae9685

core/api/module-lib-current.txt

+7 −6
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
package android {



  public static final class Manifest.permission {

    field public static final String BLUETOOTH_STACK = "android.permission.BLUETOOTH_STACK";

    field public static final String CONTROL_AUTOMOTIVE_GNSS = "android.permission.CONTROL_AUTOMOTIVE_GNSS";

    field public static final String GET_INTENT_SENDER_INTENT = "android.permission.GET_INTENT_SENDER_INTENT";

    field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE";
@@ -156,12 +157,12 @@ package android.media { 
    method public void adjustSuggestedStreamVolumeForUid(int, int, int, @NonNull String, int, int, int);

    method @NonNull public java.util.List<android.bluetooth.BluetoothCodecConfig> getHwOffloadFormatsSupportedForA2dp();

    method @NonNull public java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig> getHwOffloadFormatsSupportedForLeAudio();

    method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void handleBluetoothActiveDeviceChanged(@Nullable android.bluetooth.BluetoothDevice, @Nullable android.bluetooth.BluetoothDevice, @NonNull android.media.BluetoothProfileConnectionInfo);

    method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setA2dpSuspended(boolean);

    method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setBluetoothHeadsetProperties(@NonNull String, boolean, boolean);

    method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setHfpEnabled(boolean);

    method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setHfpSamplingRate(int);

    method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setHfpVolume(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK) public void handleBluetoothActiveDeviceChanged(@Nullable android.bluetooth.BluetoothDevice, @Nullable android.bluetooth.BluetoothDevice, @NonNull android.media.BluetoothProfileConnectionInfo);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK) public void setA2dpSuspended(boolean);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK) public void setBluetoothHeadsetProperties(@NonNull String, boolean, boolean);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK) public void setHfpEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK) public void setHfpSamplingRate(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK) public void setHfpVolume(int);

    method public void setStreamVolumeForUid(int, int, int, @NonNull String, int, int, int);

    field public static final int FLAG_FROM_KEY = 4096; // 0x1000

  }

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -2278,7 +2278,8 @@ 
        android:protectionLevel="signature" />



    <!-- Allows bluetooth stack to access files

         @hide This should only be used by Bluetooth apk.

         This should only be granted to the Bluetooth apk.

         @hide @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES)

    -->

    <permission android:name="android.permission.BLUETOOTH_STACK"

        android:protectionLevel="signature" />