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

Commit b821c49e authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 00ab61e2: Merge "Use unified Tethering Permission Check" into lmp-dev 

* commit '00ab61e2':
  Use unified Tethering Permission Check
parents 6a1885b1 00ab61e2

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -302,6 +302,7 @@ 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());

        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)) {