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

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

Merge "Add BLUETOOTH_PRIVILEGED permission as a requirement for all new... 

Merge "Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth SystemApis and for hidden connect/disconnect APIs." am: c1cae420

Change-Id: Ib90eed22c3dfa4a0aafba0a94f3ca5769a6cf6a2
parents 06213e21 c1cae420

api/system-current.txt

+19 −87
Original line number Diff line number Diff line
@@ -1292,16 +1292,8 @@ package android.app.usage { 
package android.bluetooth {















  public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void disableOptionalCodecs(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void enableOptionalCodecs(@NonNull android.bluetooth.BluetoothDevice);













    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH) public android.bluetooth.BluetoothDevice getActiveDevice();













    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH) public android.bluetooth.BluetoothCodecStatus getCodecStatus(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public int isOptionalCodecsEnabled(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public int isOptionalCodecsSupported(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void setCodecConfigPreference(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothCodecConfig);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void setOptionalCodecsEnabled(@NonNull android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);















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















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















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









@@ -1312,28 +1304,23 @@ package android.bluetooth {



























  public final class BluetoothA2dpSink implements android.bluetooth.BluetoothProfile {















    method public void finalize();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isAudioPlaying(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isAudioPlaying(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);















    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED";















  }





























  public final class BluetoothAdapter {















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean addOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean connectAllEnabledProfiles(@NonNull android.bluetooth.BluetoothDevice);















    method public boolean disableBLE();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean disconnectAllEnabledProfiles(@NonNull android.bluetooth.BluetoothDevice);















    method public boolean enableBLE();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean enableNoAutoConnect();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean factoryReset();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public long getDiscoveryEndMillis();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public long getDiscoveryEndMillis();















    method public boolean isBleScanAlwaysAvailable();















    method public boolean isLeEnabled();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean removeActiveDevice(int);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean removeOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setActiveDevice(@NonNull android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setScanMode(int, long);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setScanMode(int);















    field public static final String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED";















    field public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";















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









@@ -1345,70 +1332,17 @@ package android.bluetooth {













    method public void onMetadataChanged(@NonNull android.bluetooth.BluetoothDevice, int, @Nullable byte[]);















  }



























  public final class BluetoothCodecConfig implements android.os.Parcelable {













    ctor public BluetoothCodecConfig(int, int, int, int, int, long, long, long, long);













    ctor public BluetoothCodecConfig(int);













    method public int getBitsPerSample();













    method @NonNull public String getCodecName();













    method public int getCodecPriority();













    method public long getCodecSpecific1();













    method public int getCodecType();













    method public int getSampleRate();













    method public boolean isMandatoryCodec();













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













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













    field public static final int BITS_PER_SAMPLE_32 = 4; // 0x4













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













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













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













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













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













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













    field public static final int CODEC_PRIORITY_HIGHEST = 1000000; // 0xf4240













    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothCodecConfig> CREATOR;













    field public static final int SAMPLE_RATE_176400 = 16; // 0x10













    field public static final int SAMPLE_RATE_192000 = 32; // 0x20













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













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













    field public static final int SAMPLE_RATE_88200 = 4; // 0x4













    field public static final int SAMPLE_RATE_96000 = 8; // 0x8













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













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













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













    field public static final int SOURCE_CODEC_TYPE_APTX_HD = 3; // 0x3













    field public static final int SOURCE_CODEC_TYPE_INVALID = 1000000; // 0xf4240













    field public static final int SOURCE_CODEC_TYPE_LDAC = 4; // 0x4













    field public static final int SOURCE_CODEC_TYPE_MAX = 5; // 0x5













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













  }

























  public final class BluetoothCodecStatus implements android.os.Parcelable {













    ctor public BluetoothCodecStatus(@Nullable android.bluetooth.BluetoothCodecConfig, @Nullable android.bluetooth.BluetoothCodecConfig[], @Nullable android.bluetooth.BluetoothCodecConfig[]);













    method @Nullable public android.bluetooth.BluetoothCodecConfig getCodecConfig();













    method @Nullable public android.bluetooth.BluetoothCodecConfig[] getCodecsLocalCapabilities();













    method @Nullable public android.bluetooth.BluetoothCodecConfig[] getCodecsSelectableCapabilities();













    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothCodecStatus> CREATOR;













    field public static final String EXTRA_CODEC_STATUS = "android.bluetooth.extra.CODEC_STATUS";













  }



























  public final class BluetoothDevice implements android.os.Parcelable {















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean cancelBondProcess();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean cancelPairing();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getBatteryLevel();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getMessageAccessPermission();















    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public byte[] getMetadata(int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getPhonebookAccessPermission();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getSimAccessPermission();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isBondingInitiatedLocally();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getSimAccessPermission();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean isConnected();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean isEncrypted();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isInSilenceMode();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean removeBond();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setAlias(@NonNull String);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setMessageAccessPermission(int);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setMetadata(int, @NonNull byte[]);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setPhonebookAccessPermission(int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPin(@NonNull String);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setSilenceMode(boolean);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setSimAccessPermission(int);















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










@@ -1438,17 +1372,15 @@ package android.bluetooth {













  public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean connect(android.bluetooth.BluetoothDevice);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(android.bluetooth.BluetoothDevice);













    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH) public android.bluetooth.BluetoothDevice getActiveDevice();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);















    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPriority(android.bluetooth.BluetoothDevice, int);















  }





























  public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {













    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH) public java.util.List<android.bluetooth.BluetoothDevice> getActiveDevices();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public long getHiSyncId(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public long getHiSyncId(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);















  }





























  public final class BluetoothHidDevice implements android.bluetooth.BluetoothProfile {









@@ -1457,9 +1389,9 @@ package android.bluetooth {



























  public final class BluetoothHidHost implements android.bluetooth.BluetoothProfile {















    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);















    field public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.input.profile.action.CONNECTION_STATE_CHANGED";















  }























@@ -1467,14 +1399,14 @@ package android.bluetooth {













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void close();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) protected void finalize();















    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice, int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);















    field public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.map.profile.action.CONNECTION_STATE_CHANGED";















  }



























  public final class BluetoothPan implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {













  public final class BluetoothPan implements android.bluetooth.BluetoothProfile {















    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionState(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isTetheringOn();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void setBluetoothTethering(boolean);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);









@@ -1488,7 +1420,7 @@ package android.bluetooth {













  }





























  public class BluetoothPbap implements android.bluetooth.BluetoothProfile {













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionState(@Nullable android.bluetooth.BluetoothDevice);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);















    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED";















  }

































core/java/android/bluetooth/BluetoothA2dp.java



+27
−16




























Original line number
Diff line number
Diff line








@@ -433,7 +433,7 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * is active















     * @hide















     */













    @SystemApi













    @UnsupportedAppUsage















    @Nullable















    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public BluetoothDevice getActiveDevice() {










@@ -462,7 +462,7 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * @return true if priority is set, false on error















     * @hide















     */













    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean setPriority(BluetoothDevice device, int priority) {















        if (DBG) log("setPriority(" + device + ", " + priority + ")");















        return setConnectionPolicy(device, BluetoothAdapter.priorityToConnectionPolicy(priority));









@@ -481,7 +481,7 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean setConnectionPolicy(@NonNull BluetoothDevice device,















            @ConnectionPolicy int connectionPolicy) {















        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");










@@ -517,7 +517,18 @@ public final class BluetoothA2dp implements BluetoothProfile {













    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)















    public int getPriority(BluetoothDevice device) {















        if (VDBG) log("getPriority(" + device + ")");













        return BluetoothAdapter.connectionPolicyToPriority(getConnectionPolicy(device));













        try {













            final IBluetoothA2dp service = getService();













            if (service != null && isEnabled()













                    && isValidDevice(device)) {













                return BluetoothAdapter.connectionPolicyToPriority(service.getPriority(device));













            }













            if (service == null) Log.w(TAG, "Proxy not attached to service");













            return BluetoothProfile.PRIORITY_OFF;













        } catch (RemoteException e) {













            Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));













            return BluetoothProfile.PRIORITY_OFF;













        }















    }































    /**









@@ -532,7 +543,7 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {















        if (VDBG) log("getConnectionPolicy(" + device + ")");















        try {










@@ -640,7 +651,7 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * @return the current codec status















     * @hide















     */













    @SystemApi













    @UnsupportedAppUsage















    @Nullable















    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) {










@@ -669,8 +680,8 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * @param codecConfig the codec configuration preference















     * @hide















     */













    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)













    @UnsupportedAppUsage













    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public void setCodecConfigPreference(@NonNull BluetoothDevice device,















                                         @NonNull BluetoothCodecConfig codecConfig) {















        if (DBG) Log.d(TAG, "setCodecConfigPreference(" + device + ")");










@@ -699,8 +710,8 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * active A2DP Bluetooth device.















     * @hide















     */













    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)













    @UnsupportedAppUsage













    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public void enableOptionalCodecs(@NonNull BluetoothDevice device) {















        if (DBG) Log.d(TAG, "enableOptionalCodecs(" + device + ")");















        verifyDeviceNotNull(device, "enableOptionalCodecs");









@@ -714,8 +725,8 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * active A2DP Bluetooth device.















     * @hide















     */













    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)













    @UnsupportedAppUsage













    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public void disableOptionalCodecs(@NonNull BluetoothDevice device) {















        if (DBG) Log.d(TAG, "disableOptionalCodecs(" + device + ")");















        verifyDeviceNotNull(device, "disableOptionalCodecs");










@@ -755,7 +766,7 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * OPTIONAL_CODECS_SUPPORTED.















     * @hide















     */













    @SystemApi













    @UnsupportedAppUsage















    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)















    @OptionalCodecsSupportStatus















    public int isOptionalCodecsSupported(@NonNull BluetoothDevice device) {









@@ -781,7 +792,7 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * OPTIONAL_CODECS_PREF_DISABLED.















     * @hide















     */













    @SystemApi













    @UnsupportedAppUsage















    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)















    @OptionalCodecsPreferenceStatus















    public int isOptionalCodecsEnabled(@NonNull BluetoothDevice device) {









@@ -808,8 +819,8 @@ public final class BluetoothA2dp implements BluetoothProfile {













     * OPTIONAL_CODECS_PREF_DISABLED.















     * @hide















     */













    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)













    @UnsupportedAppUsage













    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)















    public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device,















            @OptionalCodecsPreferenceStatus int value) {















        verifyDeviceNotNull(device, "setOptionalCodecsEnabled");

































core/java/android/bluetooth/BluetoothA2dpSink.java



+7
−7


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/bluetooth/BluetoothAdapter.java



+7
−8




























Original line number
Diff line number
Diff line








@@ -1214,7 +1214,7 @@ public final class BluetoothAdapter {













     * @return true to indicate that the config file was successfully cleared















     * @hide















     */













    @SystemApi













    @UnsupportedAppUsage















    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean factoryReset() {















        try {










@@ -1506,8 +1506,9 @@ public final class BluetoothAdapter {













     * @return true if the scan mode was set, false otherwise















     * @hide















     */













    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)













    @UnsupportedAppUsage(publicAlternatives = "Use {@link #ACTION_REQUEST_DISCOVERABLE}, which "













            + "shows UI that confirms the user wants to go into discoverable mode.")













    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public boolean setScanMode(@ScanMode int mode, long durationMillis) {















        if (getState() != STATE_ON) {















            return false;










@@ -1555,8 +1556,8 @@ public final class BluetoothAdapter {













     * @return true if the scan mode was set, false otherwise















     * @hide















     */













    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)













    @UnsupportedAppUsage













    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public boolean setScanMode(@ScanMode int mode) {















        if (getState() != STATE_ON) {















            return false;










@@ -1620,7 +1621,7 @@ public final class BluetoothAdapter {













     * @hide















     */















    @SystemApi













    @RequiresPermission(Manifest.permission.BLUETOOTH)













    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public long getDiscoveryEndMillis() {















        try {















            mServiceLock.readLock().lock();










@@ -1872,7 +1873,6 @@ public final class BluetoothAdapter {













     *















     * @hide















     */













    @SystemApi















    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean connectAllEnabledProfiles(@NonNull BluetoothDevice device) {















        try {










@@ -1901,7 +1901,6 @@ public final class BluetoothAdapter {













     *















     * @hide















     */













    @SystemApi















    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)















    public boolean disconnectAllEnabledProfiles(@NonNull BluetoothDevice device) {















        try {

































core/java/android/bluetooth/BluetoothCodecConfig.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.bluetooth;





























import android.annotation.IntDef;















import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.compat.annotation.UnsupportedAppUsage;















import android.os.Parcel;















import android.os.Parcelable;









@@ -34,7 +33,6 @@ import java.util.Objects;













 *















 * {@hide}















 */













@SystemApi















public final class BluetoothCodecConfig implements Parcelable {















    // Add an entry for each source codec here.















    // NOTE: The values should be same as those listed in the following file: