Merge "Reject incoming tethering connections if Tethering option is not enabled."

2011-02-07 16:49:26 -08:00
parent 5e2b123e48 8f08ae9661
commit 609602ed77
1 changed files with 1 additions and 2 deletions
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -660,8 +660,7 @@ class BluetoothEventLoop {
             } else {
                 Log.i(TAG, "Rejecting incoming HID connection from " + address);
             }
-        } else if (BluetoothUuid.isBnep(uuid) || BluetoothUuid.isNap(uuid) &&
-                mBluetoothService.allowIncomingTethering()){
+        } else if (BluetoothUuid.isBnep(uuid) && mBluetoothService.allowIncomingTethering()){
            authorized = true;
        } else {
            Log.i(TAG, "Rejecting incoming " + deviceUuid + " connection from " + address);