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

Commit 594fd88d authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "Derestrict some APIs." am: 8e97fea3 am: 4651bc7b am: 6b932718 am: d65ce8e5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib21b5304948c76e0b9b7af5bd6442882166f1600
parents 3e4425ff d65ce8e5

core/java/android/bluetooth/BluetoothA2dp.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     * @hide

     */

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 181103983)

    public static final String ACTION_CODEC_CONFIG_CHANGED =

    public static final String ACTION_CODEC_CONFIG_CHANGED =

            "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED";

            "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED";
@@ -684,7 +684,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return the current codec status

     * @return the current codec status

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 181103983)

    @Nullable

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) {

    public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) {
@@ -713,7 +713,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @param codecConfig the codec configuration preference

     * @param codecConfig the codec configuration preference

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 181103983)

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public void setCodecConfigPreference(@NonNull BluetoothDevice device,

    public void setCodecConfigPreference(@NonNull BluetoothDevice device,

                                         @NonNull BluetoothCodecConfig codecConfig) {

                                         @NonNull BluetoothCodecConfig codecConfig) {