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

Commit caa8ec63 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Make tetherChangePermission to be secured for AppOps permission" am:... 

Merge "Make tetherChangePermission to be secured for AppOps permission" am: 33b7f2df am: 86bdfc1e am: 13074fbd
am: f25a6fbb

Change-Id: I5d70ccfa27660e056ed67c70f13e34a5b938e210
parents 87a6440e f25a6fbb

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,9 @@ public class PanService extends ProfileService { 




    void setBluetoothTethering(boolean value) {

    void setBluetoothTethering(boolean value) {

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

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

        ConnectivityManager.enforceTetherChangePermission(getBaseContext());

        final Context context = getBaseContext();

        String pkgName = context.getOpPackageName();

        ConnectivityManager.enforceTetherChangePermission(context, pkgName);

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

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

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

        if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {

        if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {