Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcd9698f authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "AdapterService: Delete unused code" into main am: 15393778 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2741461



Change-Id: Id35707a499ef1bac83a74c85f17ded7576808190
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 570d869e 15393778

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

+0 −24
Original line number Original line Diff line number Diff line
@@ -3962,30 +3962,6 @@ public class AdapterService extends Service { 
            return service.getMaxConnectedAudioDevices();

            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

        @Override

        public void factoryReset(AttributionSource source, SynchronousResultReceiver receiver) {

        public void factoryReset(AttributionSource source, SynchronousResultReceiver receiver) {

            try {

            try {

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceBinderTest.java

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

        verify(mService).getScanMode();

    }

    }





    @Test

    public void isA2dpOffloadEnabled() {

        mBinder.isA2dpOffloadEnabled(mAttributionSource, SynchronousResultReceiver.get());

        verify(mService).isA2dpOffloadEnabled();

    }



    @Test

    @Test

    public void isActivityAndEnergyReportingSupported() {

    public void isActivityAndEnergyReportingSupported() {

        mBinder.isActivityAndEnergyReportingSupported(SynchronousResultReceiver.get());

        mBinder.isActivityAndEnergyReportingSupported(SynchronousResultReceiver.get());