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

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

Block guest user from Bluetooth tethering connect/disconnect am: cd763274 

Change-Id: Ia46a5017d71294a7a9b08671bf4c3dba788805d8
parents 39627d96 cd763274

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

+13 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.bluetooth.Utils; 
import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.MetricsLogger;

import com.android.bluetooth.btservice.ProfileService;

import com.android.internal.annotations.VisibleForTesting;



import java.net.InetAddress;

import java.util.ArrayList;
@@ -69,6 +70,9 @@ public class PanService extends ProfileService { 
    private String mNapIfaceAddr;

    private boolean mNativeAvailable;



    @VisibleForTesting

    UserManager mUserManager;



    private static final int MESSAGE_CONNECT = 1;

    private static final int MESSAGE_DISCONNECT = 2;

    private static final int MESSAGE_CONNECT_STATE_CHANGED = 11;
@@ -118,6 +122,8 @@ public class PanService extends ProfileService { 
        initializeNative();

        mNativeAvailable = true;



        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);



        mNetworkFactory =

                new BluetoothTetheringNetworkFactory(getBaseContext(), getMainLooper(), this);

        setPanService(this);
@@ -139,6 +145,9 @@ public class PanService extends ProfileService { 
            cleanupNative();

            mNativeAvailable = false;

        }



        mUserManager = null;



        if (mPanDevices != null) {

           int[] desiredStates = {BluetoothProfile.STATE_CONNECTING, BluetoothProfile.STATE_CONNECTED,

                                  BluetoothProfile.STATE_DISCONNECTING};
@@ -330,6 +339,10 @@ public class PanService extends ProfileService { 


    public boolean connect(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        if (mUserManager.isGuestUser()) {

            Log.w(TAG, "Guest user does not have the permission to change the WiFi network");

            return false;

        }

        if (getConnectionState(device) != BluetoothProfile.STATE_DISCONNECTED) {

            Log.e(TAG, "Pan Device not disconnected: " + device);

            return false;

android/app/tests/unit/src/com/android/bluetooth/pan/PanServiceTest.java

+13 −0
Original line number Diff line number Diff line
@@ -15,8 +15,12 @@ 
 */

package com.android.bluetooth.pan;



import static org.mockito.Mockito.when;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.os.UserManager;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;
@@ -47,6 +51,7 @@ public class PanServiceTest { 
    @Rule public final ServiceTestRule mServiceRule = new ServiceTestRule();



    @Mock private AdapterService mAdapterService;

    @Mock private UserManager mMockUserManager;



    @Before

    public void setUp() throws Exception {
@@ -61,6 +66,7 @@ public class PanServiceTest { 
        // Try getting the Bluetooth adapter

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        Assert.assertNotNull(mAdapter);

        mService.mUserManager = mMockUserManager;

    }



    @After
@@ -78,4 +84,11 @@ public class PanServiceTest { 
    public void testInitialize() {

        Assert.assertNotNull(PanService.getPanService());

    }



    @Test

    public void testGuestUserConnect() {

        BluetoothDevice device = TestUtils.getTestDevice(mAdapter, 0);

        when(mMockUserManager.isGuestUser()).thenReturn(true);

        Assert.assertFalse(mService.connect(device));

    }

}