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

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

Merge "Fix method not enforcing correct permissions" am: ac8e110a am: 3b2c8166 

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



Change-Id: Ibbb0333f2e8476677c4c39f34c091fc472a54607
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2080aec1 3b2c8166

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

+52 −7
Original line number Diff line number Diff line
@@ -3877,9 +3877,17 @@ public class AdapterService extends Service { 
                receiver.propagateException(e);

            }

        }

        @RequiresPermission(allOf = {

                android.Manifest.permission.BLUETOOTH_CONNECT,

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

        })

        private boolean allowLowLatencyAudio(boolean allowed, BluetoothDevice device) {

            AdapterService service = getService();

            if (service == null) {

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkConnectPermissionForDataDelivery(

                            service, Utils.getCallingAttributionSource(service),

                                "AdapterService allowLowLatencyAudio")) {

                return false;

            }

            enforceBluetoothPrivilegedPermission(service);
@@ -3895,12 +3903,24 @@ public class AdapterService extends Service { 
                receiver.propagateException(e);

            }

        }

        public int startRfcommListener(

        @RequiresPermission(allOf = {

                android.Manifest.permission.BLUETOOTH_CONNECT,

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

        })

        private int startRfcommListener(

                String name,

                ParcelUuid uuid,

                PendingIntent pendingIntent,

                AttributionSource attributionSource) {

            return mService.startRfcommListener(name, uuid, pendingIntent, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkConnectPermissionForDataDelivery(

                            service, attributionSource, "AdapterService startRfcommListener")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            enforceBluetoothPrivilegedPermission(service);

            return service.startRfcommListener(name, uuid, pendingIntent, attributionSource);

        }



        @Override
@@ -3912,8 +3932,20 @@ public class AdapterService extends Service { 
                receiver.propagateException(e);

            }

        }

        public int stopRfcommListener(ParcelUuid uuid, AttributionSource attributionSource) {

            return mService.stopRfcommListener(uuid, attributionSource);

        @RequiresPermission(allOf = {

                android.Manifest.permission.BLUETOOTH_CONNECT,

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

        })

        private int stopRfcommListener(ParcelUuid uuid, AttributionSource attributionSource) {

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkConnectPermissionForDataDelivery(

                            service, attributionSource, "AdapterService stopRfcommListener")) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;

            }

            enforceBluetoothPrivilegedPermission(service);

            return service.stopRfcommListener(uuid, attributionSource);

        }



        @Override
@@ -3925,9 +3957,22 @@ public class AdapterService extends Service { 
                receiver.propagateException(e);

            }

        }

        public IncomingRfcommSocketInfo retrievePendingSocketForServiceRecord(

        @RequiresPermission(allOf = {

                android.Manifest.permission.BLUETOOTH_CONNECT,

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

        })

        private IncomingRfcommSocketInfo retrievePendingSocketForServiceRecord(

                ParcelUuid uuid, AttributionSource attributionSource) {

            return mService.retrievePendingSocketForServiceRecord(uuid, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)

                    || !Utils.checkConnectPermissionForDataDelivery(

                            service, attributionSource,

                            "AdapterService retrievePendingSocketForServiceRecord")) {

                return null;

            }

            enforceBluetoothPrivilegedPermission(service);

            return service.retrievePendingSocketForServiceRecord(uuid, attributionSource);

        }



        @Override