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

Commit 8863907d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove BluetoothHeadset#setPriority which was deprecated in Android 11"... 

Merge "Remove BluetoothHeadset#setPriority which was deprecated in Android 11" am: cdf9e7ef am: 283653d4 am: c93442ca am: d2cc19e8

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

Change-Id: I9ec0bf65ff1691aaaa4ba4be0dab40b065755226
parents e3856b93 d2cc19e8

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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 {

































core/api/system-removed.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -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 {

































core/java/android/bluetooth/BluetoothHeadset.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -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