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

Commit e9abca11 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Added missing check for managed user to Bluetooth APIs" am: 24c05c8d am: e930e244 

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



Change-Id: I09c8c94d36a5177caa8f93b3740140f30ab84b64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4fcbdbe e930e244

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

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


        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private A2dpService getService(AttributionSource source) {

            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkServiceAvailable(mService, TAG)

            if (!Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)

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

                return null;

            }

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

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


        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private A2dpSinkService getService(AttributionSource source) {

            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkServiceAvailable(mService, TAG)

            if (!Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)

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

                return null;

            }

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

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


        @Override

        public void sendVolumeChanged(int volume) {

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

                return;

            }



            if (mService == null) {

            if (mService == null

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

                return;

            }

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

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


        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private AvrcpControllerService getService(AttributionSource source) {

            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkServiceAvailable(mService, TAG)

            if (!Utils.checkServiceAvailable(mService, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(mService, TAG)

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

                return null;

            }

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

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

            BatteryService service = mServiceRef.get();



            if (!Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkServiceAvailable(service, TAG)

            if (!Utils.checkServiceAvailable(service, TAG)

                    || !Utils.checkCallerIsSystemOrActiveOrManagedUser(service, TAG)

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

                return null;

            }