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

Commit fcbeb875 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Update permission enforcement for BluetoothPan System APIs to enforce am: 9eada416 am: fdfdccbd 

Change-Id: I4d9c6c714bdce8c7a5886c743ef8f9e8413ef5f2
parents 33dce89d fdfdccbd

android/app/src/com/android/bluetooth/pan/PanService.java

+10 −4
Original line number Diff line number Diff line
@@ -360,6 +360,8 @@ public class PanService extends ProfileService { 
    }



    public int getConnectionState(BluetoothDevice device) {

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        BluetoothPanDevice panDevice = mPanDevices.get(device);

        if (panDevice == null) {

            return BluetoothPan.STATE_DISCONNECTED;
@@ -383,7 +385,8 @@ public class PanService extends ProfileService { 


    public boolean isTetheringOn() {

        // TODO(BT) have a variable marking the on/off state

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        return mTetherOn;

    }
@@ -391,7 +394,8 @@ public class PanService extends ProfileService { 
        if (DBG) {

            Log.d(TAG, "setBluetoothTethering: " + value + ", mTetherOn: " + mTetherOn);

        }

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        final Context context = getBaseContext();



        ConnectivityManager.enforceTetherChangePermission(context, pkgName);
@@ -426,7 +430,8 @@ public class PanService extends ProfileService { 
     * @return true if connectionPolicy is set, false on error

     */

    public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        if (DBG) {

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

        }
@@ -461,7 +466,8 @@ public class PanService extends ProfileService { 
    }



    public List<BluetoothDevice> getConnectedDevices() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        List<BluetoothDevice> devices =

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

        return devices;