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

Merge "Resolve BluetoothHearingAid API usages by Settings" am: a83641557b am: 1099497d45

Browse Source 
Change-Id: I4708867d2e125bfa1adc27cf18817a5e7d90046d
This commit is contained in:
Automerger Merge Worker
2019-12-13 18:50:48 +00:00
parent d6bc078add 1099497d45
commit 4c1644cdf0
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -1395,7 +1395,9 @@ package android.bluetooth {
}
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);
}

7
core/java/android/bluetooth/BluetoothHearingAid.java
View File

@@ -335,9 +335,9 @@ public final class BluetoothHearingAid implements BluetoothProfile {
* is not active, it will be null on that position. Returns empty list on error.
* @hide
*/
@UnsupportedAppUsage
@SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH)
public List<BluetoothDevice> getActiveDevices() {
public @NonNull List<BluetoothDevice> getActiveDevices() {
if (VDBG) log("getActiveDevices()");
final IBluetoothHearingAid service = getService();
try {
@@ -559,8 +559,9 @@ public final class BluetoothHearingAid implements BluetoothProfile {
* @return the CustomerId of the device
* @hide
*/
@SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH)
public long getHiSyncId(BluetoothDevice device) {
public long getHiSyncId(@Nullable BluetoothDevice device) {
if (VDBG) {
log("getCustomerId(" + device + ")");
}