commit 7ac24de2819e5e4140ab7ab264e7cfffed4d7398
author Ganesh Ganapathi Batta <ganeshg@broadcom.com> Wed Jul 18 11:27:44 2012 -0700
committer Matthew Xie <mattx@google.com> Wed Aug 01 10:30:53 2012 -0700
tree 0433f304b9bc6e60c04f3758a33fd99e83b1ee04
parent ea0b4f90cd08ec1e798eb8bae450e36155ddccfe

Do not accept connection from remote PANU if the local role is also PANU

Fix for BLTH01537991
Change-Id: Ieea143a5929217c7dc52c541e55ddf57077b244f

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

diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java
index 5184517..e851433 100755
--- a/src/com/android/bluetooth/pan/PanService.java
+++ b/src/com/android/bluetooth/pan/PanService.java
@@ -360,13 +360,14 @@
         Log.d(TAG, "handlePanDeviceStateChange preState: " + prevState + " state: " + state);
         if (prevState == state) return;
         if (remote_role == BluetoothPan.LOCAL_PANU_ROLE) {
-            Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");
             if (state == BluetoothProfile.STATE_CONNECTED) {
-                if(!mTetherOn) {
-                    Log.d(TAG, "handlePanDeviceStateChange bluetooth tethering is off, drop the connection");
+                if((!mTetherOn)||(local_role == BluetoothPan.LOCAL_PANU_ROLE)){
+                    Log.d(TAG,"handlePanDeviceStateChange BT tethering is off/Local role is PANU "+
+                              "drop the connection");
                     disconnectPanNative(Utils.getByteAddress(device));
                     return;
                 }
+                Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE");
                 ifaceAddr = enableTethering(iface);
                 if (ifaceAddr == null) Log.e(TAG, "Error seting up tether interface");