Merge "Resolve BluetoothHearingAid API usages by Settings" am: a83641557b am: 1099497d45 (4c1644cd) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -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 + ")");
		}