Merge "Remove unsupportedAppUsage in aidl" (b5fd32c8) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+4 −34

Original line number	Diff line number	Diff line
		@@ -1269,12 +1269,7 @@ public class A2dpService extends ProfileService {
		}

		@Override
		public void connect(BluetoothDevice device, SynchronousResultReceiver receiver) {
		connectWithAttribution(device, Utils.getCallingAttributionSource(mService), receiver);
		}

		@Override
		public void connectWithAttribution(BluetoothDevice device, AttributionSource source,
		public void connect(BluetoothDevice device, AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		A2dpService service = getService(source);
		@@ -1289,13 +1284,7 @@ public class A2dpService extends ProfileService {
		}

		@Override
		public void disconnect(BluetoothDevice device, SynchronousResultReceiver receiver) {
		disconnectWithAttribution(device, Utils.getCallingAttributionSource(mService),
		receiver);
		}

		@Override
		public void disconnectWithAttribution(BluetoothDevice device, AttributionSource source,
		public void disconnect(BluetoothDevice device, AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		A2dpService service = getService(source);
		@@ -1310,13 +1299,7 @@ public class A2dpService extends ProfileService {
		}

		@Override
		public void getConnectedDevices(SynchronousResultReceiver receiver) {
		getConnectedDevicesWithAttribution(Utils.getCallingAttributionSource(mService),
		receiver);
		}

		@Override
		public void getConnectedDevicesWithAttribution(AttributionSource source,
		public void getConnectedDevices(AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		A2dpService service = getService(source);
		@@ -1332,13 +1315,6 @@ public class A2dpService extends ProfileService {

		@Override
		public void getDevicesMatchingConnectionStates(int[] states,
		SynchronousResultReceiver receiver) {
		getDevicesMatchingConnectionStatesWithAttribution(states,
		Utils.getCallingAttributionSource(mService), receiver);
		}

		@Override
		public void getDevicesMatchingConnectionStatesWithAttribution(int[] states,
		AttributionSource source, SynchronousResultReceiver receiver) {
		try {
		A2dpService service = getService(source);
		@@ -1353,13 +1329,7 @@ public class A2dpService extends ProfileService {
		}

		@Override
		public void getConnectionState(BluetoothDevice device, SynchronousResultReceiver receiver) {
		getConnectionStateWithAttribution(device, Utils.getCallingAttributionSource(mService),
		receiver);
		}

		@Override
		public void getConnectionStateWithAttribution(BluetoothDevice device,
		public void getConnectionState(BluetoothDevice device,
		AttributionSource source, SynchronousResultReceiver receiver) {
		try {
		A2dpService service = getService(source);

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+12 −47

Original line number	Diff line number	Diff line
		@@ -1676,18 +1676,10 @@ public class AdapterService extends Service {
		}

		@Override
		public String getAddress() {
		if (mService == null) {
		return null;
		}
		return getAddressWithAttribution(Utils.getCallingAttributionSource(mService));
		}

		@Override
		public void getAddressWithAttribution(AttributionSource source,
		public void getAddress(AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		receiver.send(getAddressWithAttribution(source));
		receiver.send(getAddress(source));
		} catch (RuntimeException e) {
		receiver.propagateException(e);
		}
		@@ -1696,7 +1688,7 @@ public class AdapterService extends Service {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.LOCAL_MAC_ADDRESS,
		})
		private String getAddressWithAttribution(AttributionSource attributionSource) {
		private String getAddress(AttributionSource attributionSource) {
		AdapterService service = getService();
		if (service == null \|\| !callerIsSystemOrActiveOrManagedUser(service, TAG, "getAddress")
		\|\| !Utils.checkConnectPermissionForDataDelivery(
		@@ -2425,25 +2417,16 @@ public class AdapterService extends Service {
		}

		@Override
		public int getConnectionState(BluetoothDevice device) {
		if (mService == null) {
		return BluetoothProfile.STATE_DISCONNECTED;
		}
		return getConnectionStateWithAttribution(device,
		Utils.getCallingAttributionSource(mService));
		}

		@Override
		public void getConnectionStateWithAttribution(BluetoothDevice device,
		public void getConnectionState(BluetoothDevice device,
		AttributionSource source, SynchronousResultReceiver receiver) {
		try {
		receiver.send(getConnectionStateWithAttribution(device, source));
		receiver.send(getConnectionState(device, source));
		} catch (RuntimeException e) {
		receiver.propagateException(e);
		}
		}
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private int getConnectionStateWithAttribution(
		private int getConnectionState(
		BluetoothDevice device, AttributionSource attributionSource) {
		AdapterService service = getService();
		if (service == null \|\| !Utils.checkConnectPermissionForDataDelivery(
		@@ -2693,25 +2676,16 @@ public class AdapterService extends Service {
		}

		@Override
		public String getRemoteAlias(BluetoothDevice device) {
		if (mService == null) {
		return null;
		}
		return getRemoteAliasWithAttribution(device,
		Utils.getCallingAttributionSource(mService));
		}

		@Override
		public void getRemoteAliasWithAttribution(BluetoothDevice device, AttributionSource source,
		public void getRemoteAlias(BluetoothDevice device, AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		receiver.send(getRemoteAliasWithAttribution(device, source));
		receiver.send(getRemoteAlias(device, source));
		} catch (RuntimeException e) {
		receiver.propagateException(e);
		}
		}
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private String getRemoteAliasWithAttribution(
		private String getRemoteAlias(
		BluetoothDevice device, AttributionSource attributionSource) {
		AdapterService service = getService();
		if (service == null
		@@ -2816,19 +2790,10 @@ public class AdapterService extends Service {
		}

		@Override
		public boolean fetchRemoteUuids(BluetoothDevice device) {
		if (mService == null) {
		return false;
		}
		return fetchRemoteUuidsWithAttribution(device, TRANSPORT_AUTO,
		Utils.getCallingAttributionSource(mService));
		}

		@Override
		public void fetchRemoteUuidsWithAttribution(BluetoothDevice device, int transport,
		public void fetchRemoteUuids(BluetoothDevice device, int transport,
		AttributionSource source, SynchronousResultReceiver receiver) {
		try {
		receiver.send(fetchRemoteUuidsWithAttribution(device, transport, source));
		receiver.send(fetchRemoteUuids(device, transport, source));
		} catch (RuntimeException e) {
		receiver.propagateException(e);
		}
		@@ -2837,7 +2802,7 @@ public class AdapterService extends Service {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		})
		private boolean fetchRemoteUuidsWithAttribution(
		private boolean fetchRemoteUuids(
		BluetoothDevice device, int transport, AttributionSource attributionSource) {
		AdapterService service = getService();
		if (service == null

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+4 −56

Original line number	Diff line number	Diff line
		@@ -484,20 +484,7 @@ public class HeadsetService extends ProfileService {
		}

		@Override
		public boolean connect(BluetoothDevice device) {
		if (mService == null) {
		return false;
		}
		AttributionSource source = Utils.getCallingAttributionSource(mService);
		HeadsetService service = getService(source);
		if (service == null) {
		return false;
		}
		return service.connect(device);
		}

		@Override
		public void connectWithAttribution(BluetoothDevice device, AttributionSource source,
		public void connect(BluetoothDevice device, AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		HeadsetService service = getService(source);
		@@ -512,20 +499,7 @@ public class HeadsetService extends ProfileService {
		}

		@Override
		public boolean disconnect(BluetoothDevice device) {
		if (mService == null) {
		return false;
		}
		AttributionSource source = Utils.getCallingAttributionSource(mService);
		HeadsetService service = getService(source);
		if (service == null) {
		return false;
		}
		return service.disconnect(device);
		}

		@Override
		public void disconnectWithAttribution(BluetoothDevice device, AttributionSource source,
		public void disconnect(BluetoothDevice device, AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		HeadsetService service = getService(source);
		@@ -540,20 +514,7 @@ public class HeadsetService extends ProfileService {
		}

		@Override
		public List<BluetoothDevice> getConnectedDevices() {
		if (mService == null) {
		return new ArrayList<BluetoothDevice>(0);
		}
		AttributionSource source = Utils.getCallingAttributionSource(mService);
		HeadsetService service = getService(source);
		if (service == null) {
		return new ArrayList<BluetoothDevice>(0);
		}
		return service.getConnectedDevices();
		}

		@Override
		public void getConnectedDevicesWithAttribution(AttributionSource source,
		public void getConnectedDevices(AttributionSource source,
		SynchronousResultReceiver receiver) {
		try {
		HeadsetService service = getService(source);
		@@ -583,20 +544,7 @@ public class HeadsetService extends ProfileService {
		}

		@Override
		public int getConnectionState(BluetoothDevice device) {
		if (mService == null) {
		return BluetoothProfile.STATE_DISCONNECTED;
		}
		AttributionSource source = Utils.getCallingAttributionSource(mService);
		HeadsetService service = getService(source);
		if (service == null) {
		return BluetoothProfile.STATE_DISCONNECTED;
		}
		return service.getConnectionState(device);
		}

		@Override
		public void getConnectionStateWithAttribution(BluetoothDevice device,
		public void getConnectionState(BluetoothDevice device,
		AttributionSource source, SynchronousResultReceiver receiver) {
		try {
		HeadsetService service = getService(source);

apex/hiddenapi/hiddenapi-max-target-r-low-priority.txt

+0 −1

Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I

Landroid/bluetooth/IBluetooth$Stub;->TRANSACTION_enable:I

Landroid/bluetooth/IBluetoothManager$Stub;->TRANSACTION_enable:I

apex/hiddenapi/hiddenapi-unsupported.txt

+0 −1

Original line number	Diff line number	Diff line
		Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String;
		Landroid/bluetooth/IBluetooth$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetooth;
		Landroid/bluetooth/IBluetoothA2dp$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothA2dp;
		Landroid/bluetooth/IBluetoothCallback$Stub;-><init>()V