Merge "Remove BluetoothHeadset#setPriority which was deprecated in Android 11" am: cdf9e7ef43 am: 283653d4b1 am: c93442cac9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650990 Change-Id: I40ae55301eb6b33e596e7c7976dda4caa837e70c
This commit is contained in:
@@ -1956,7 +1956,6 @@ package android.bluetooth {
|
||||
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 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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
public class Intent implements java.lang.Cloneable android.os.Parcelable {
|
||||
|
||||
@@ -567,6 +567,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
|
||||
* @return true if priority is set, false on error
|
||||
* @hide
|
||||
* @deprecated Replaced with {@link #setConnectionPolicy(BluetoothDevice, int)}
|
||||
* @removed
|
||||
*/
|
||||
@Deprecated
|
||||
@SystemApi
|
||||
|
||||
Reference in New Issue
Block a user