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

Commit ba3a7b18 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "Bluetooth: Fix to update mTetherOn with proper value.""

parents 218005e4 e3d5723a

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

100644 → 100755
+4 −9
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import java.util.Collections; 
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import android.os.SystemProperties;





/**

 * Provides Bluetooth Pan Device profile, as a service in
@@ -320,20 +320,15 @@ public class PanService extends ProfileService { 
    }

     boolean isTetheringOn() {

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

        mTetherOn = SystemProperties.getBoolean("bluetooth.mTetherOn", false);

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

        return mTetherOn;

    }



    void setBluetoothTethering(boolean value) {



        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

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



        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if(mTetherOn != value) {

            //drop any existing panu or pan-nap connection when changing the tethering state

            mTetherOn = value;

            SystemProperties.set("bluetooth.mTetherOn", mTetherOn?"true":"false");

            List<BluetoothDevice> DevList = getConnectedDevices();

            for(BluetoothDevice dev : DevList)

                disconnect(dev);