Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove BluetoothHeadset#setPriority which was deprecated in Android 11" am: cdf9e7ef43 am: 283653d4b1

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

Change-Id: I83473c7f34f0047f8d2d75e5140a217f7fa3efaf
This commit is contained in:
Treehugger Robot
2021-03-25 03:44:03 +00:00
committed by Automerger Merge Worker
parent 10440a0441 283653d4b1
commit c93442cac9
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -1533,7 +1533,6 @@ package android.bluetooth {
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(android.bluetooth.BluetoothDevice); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(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 getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int); 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 { public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {

8
core/api/system-removed.txt
View File

@@ -48,6 +48,14 @@ package android.app.prediction {
} }
package android.bluetooth {
public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setPriority(android.bluetooth.BluetoothDevice, int);
}
}
package android.content { package android.content {
public class Intent implements java.lang.Cloneable android.os.Parcelable { public class Intent implements java.lang.Cloneable android.os.Parcelable {

1
core/java/android/bluetooth/BluetoothHeadset.java
View File

@@ -567,6 +567,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
* @return true if priority is set, false on error * @return true if priority is set, false on error
* @hide * @hide
* @deprecated Replaced with {@link #setConnectionPolicy(BluetoothDevice, int)} * @deprecated Replaced with {@link #setConnectionPolicy(BluetoothDevice, int)}
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi