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

Commit a849d30c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Enforce privileged permissions for SystemApis in HidHostService and... 

Merge "Enforce privileged permissions for SystemApis in HidHostService and BluetoothMapService" into rvc-dev am: de0fe0f2 am: 9e011abf

Change-Id: I6a2ddf3563a67e75fc1b7fa5339fe1d845641e31
parents 97fd8db6 9e011abf

android/app/src/com/android/bluetooth/hid/HidHostService.java

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.hid;



import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHidHost;

import android.bluetooth.BluetoothProfile;
@@ -355,11 +357,17 @@ public class HidHostService extends ProfileService { 
            if (service == null) {

                return BluetoothHidHost.STATE_DISCONNECTED;

            }

            enforceBluetoothPrivilegedPermission(service);

            return service.getConnectionState(device);

        }



        @Override

        public List<BluetoothDevice> getConnectedDevices() {

            HidHostService service = getService();

            if (service == null) {

                return new ArrayList<>();

            }

            enforceBluetoothPrivilegedPermission(service);

            return getDevicesMatchingConnectionStates(new int[]{BluetoothProfile.STATE_CONNECTED});

        }

android/app/src/com/android/bluetooth/map/BluetoothMapService.java

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 


package com.android.bluetooth.map;



import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;



import android.app.AlarmManager;

import android.app.PendingIntent;

import android.bluetooth.BluetoothAdapter;
@@ -1244,6 +1246,7 @@ public class BluetoothMapService extends ProfileService { 
            if (service == null) {

                return new ArrayList<>(0);

            }

            enforceBluetoothPrivilegedPermission(service);

            return service.getConnectedDevices();

        }