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

Merge "Revert "Revert "Complete hard removal of BluetoothHeadset#setPri...""

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-14 08:39:05 +00:00
committed by Android (Google) Code Review
parent b0ab17df8e 186d244044
commit e4c47bff79
2 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -600,49 +600,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
return BluetoothProfile.STATE_DISCONNECTED;
}
/**
* Set priority of the profile
*
* <p> The device should already be paired.
* Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or
* {@link BluetoothProfile#PRIORITY_OFF}
*
* @param device Paired bluetooth device
* @param priority
* @return true if priority is set, false on error
* @hide
* @deprecated Replaced with {@link #setConnectionPolicy(BluetoothDevice, int)}
* @removed
*/
@Deprecated
@SystemApi
@RequiresLegacyBluetoothAdminPermission
@RequiresBluetoothConnectPermission
@RequiresPermission(allOf = {
android.Manifest.permission.BLUETOOTH_CONNECT,
android.Manifest.permission.MODIFY_PHONE_STATE,
})
public boolean setPriority(BluetoothDevice device, int priority) {
if (DBG) log("setPriority(" + device + ", " + priority + ")");
final IBluetoothHeadset service = mService;
if (service != null && isEnabled() && isValidDevice(device)) {
if (priority != BluetoothProfile.PRIORITY_OFF
&& priority != BluetoothProfile.PRIORITY_ON) {
return false;
}
try {
return service.setPriority(
device, BluetoothAdapter.priorityToConnectionPolicy(priority),
mAttributionSource);
} catch (RemoteException e) {
Log.e(TAG, Log.getStackTraceString(new Throwable()));
return false;
}
}
if (service == null) Log.w(TAG, "Proxy not attached to service");
return false;
}
/**
* Set connection policy of the profile
*