Merge "AdapterService: Delete unused code" into main (15393778) · Commits · e / os / android_packages_modules_Bluetooth

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

+0 −24

Original line number	Diff line number	Diff line
		@@ -3947,30 +3947,6 @@ public class AdapterService extends Service {
		return service.getMaxConnectedAudioDevices();
		}

		// @Override
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void isA2dpOffloadEnabled(
		AttributionSource source, SynchronousResultReceiver receiver) {
		try {
		receiver.send(isA2dpOffloadEnabled(source));
		} catch (RuntimeException e) {
		receiver.propagateException(e);
		}
		}

		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private boolean isA2dpOffloadEnabled(AttributionSource attributionSource) {
		// don't check caller, may be called from system UI
		AdapterService service = getService();
		if (service == null
		\|\| !Utils.checkConnectPermissionForDataDelivery(
		service, attributionSource, "AdapterService isA2dpOffloadEnabled")) {
		return false;
		}

		return service.isA2dpOffloadEnabled();
		}

		@Override
		public void factoryReset(AttributionSource source, SynchronousResultReceiver receiver) {
		try {

+0 −6

Original line number	Diff line number	Diff line
		@@ -113,12 +113,6 @@ public class AdapterServiceBinderTest {
		verify(mService).getScanMode();
		}

		@Test
		public void isA2dpOffloadEnabled() {
		mBinder.isA2dpOffloadEnabled(mAttributionSource, SynchronousResultReceiver.get());
		verify(mService).isA2dpOffloadEnabled();
		}

		@Test
		public void isActivityAndEnergyReportingSupported() {
		mBinder.isActivityAndEnergyReportingSupported(SynchronousResultReceiver.get());