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

Commit ae5ccef2 authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge "HearingAidService: Cache service in getService" into main

parents 10234ade 49628640

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+7 −5
Original line number Diff line number Diff line
@@ -954,15 +954,17 @@ public class HearingAidService extends ProfileService { 


        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private HearingAidService getService(AttributionSource source) {

            // Cache mService because it can change while getService is called b/327929337

            HearingAidService service = mService;

            if (mIsTesting) {

                return mService;

                return service;

            }

            if (!Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)

                    || !Utils.checkConnectPermissionForDataDelivery(mService, source, TAG)) {

            if (!Utils.checkServiceAvailable(service, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(service, TAG)

                    || !Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {

                return null;

            }

            return mService;

            return service;

        }



        BluetoothHearingAidBinder(HearingAidService svc) {