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

Commit 24c05c8d authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Gerrit Code Review
Browse files

Merge "Added missing check for managed user to Bluetooth APIs"

parents eba62d42 1cf8ace9

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1273,8 +1273,8 @@ public class A2dpService extends ProfileService { 




        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private A2dpService getService(AttributionSource source) {

        private A2dpService getService(AttributionSource source) {

            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

            if (!Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)

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

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

                return null;

                return null;

            }

            }

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -196,8 +196,8 @@ public class A2dpSinkService extends ProfileService { 




        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private A2dpSinkService getService(AttributionSource source) {

        private A2dpSinkService getService(AttributionSource source) {

            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

            if (!Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)

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

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

                return null;

                return null;

            }

            }

android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -509,11 +509,8 @@ public class AvrcpTargetService extends ProfileService { 




        @Override

        @Override

        public void sendVolumeChanged(int volume) {

        public void sendVolumeChanged(int volume) {

            if (!Utils.callerIsSystemOrActiveUser(TAG, "sendVolumeChanged")) {

            if (mService == null

                return;

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)) {

            }



            if (mService == null) {

                return;

                return;

            }

            }

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -365,8 +365,8 @@ public class AvrcpControllerService extends ProfileService { 




        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private AvrcpControllerService getService(AttributionSource source) {

        private AvrcpControllerService getService(AttributionSource source) {

            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

            if (!Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)

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

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

                return null;

                return null;

            }

            }

android/app/src/com/android/bluetooth/bas/BatteryService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -543,8 +543,8 @@ public class BatteryService extends ProfileService { 
        private BatteryService getService(AttributionSource source) {

        private BatteryService getService(AttributionSource source) {

            BatteryService service = mServiceRef.get();

            BatteryService service = mServiceRef.get();





            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

            if (!Utils.checkServiceAvailable(service, TAG)

                    || !Utils.checkServiceAvailable(service, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(service, TAG)

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

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

                return null;

                return null;

            }

            }