summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jaikumar Ganesh <jaikumar@google.com> 2011-02-07 16:41:10 -0800
committer Jaikumar Ganesh <jaikumar@google.com> 2011-02-07 16:45:23 -0800
commit8f08ae96611a2027cece14511f63a211afed11fb (patch)
tree8a8307d7cdb7ba2c228e9d13c0ded2bab6524b47
parent1ee31175eca2fb5d6a95cb1aa4a9dbf66a5212cb (diff)
Reject incoming tethering connections if Tethering option is not enabled.
Change-Id: I40aa08ad5a3f3a2169551bbe35682910daced098
-rw-r--r--core/java/android/server/BluetoothEventLoop.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index e9f28fa9cc31..3316ea51f701 100644
--- 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);