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

Commit ff7b84f0 authored Dec 02, 2022 by Etienne Ruffieux Committed by Automerger Merge Worker Dec 02, 2022

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

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

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

Change-Id: I0d6ba3511dddc242ad6fe0dbb5d50223c34895ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 94ff867a e9abca11

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;
		}