summaryrefslogtreecommitdiffstats
path: root/core/java/android/server/BluetoothEventLoop.java
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2010-09-02 12:17:05 -0700
committerJaikumar Ganesh <jaikumar@google.com>2010-09-02 14:34:40 -0700
commitb70765cc27a174d1d4a0bab7062733ebd3eae354 (patch)
treefed13b129d87237d6aec4b4487cdb202b3791c23 /core/java/android/server/BluetoothEventLoop.java
parentbe881a3db6a80befa31dfada620e7f9a6fbba0c4 (diff)
downloadframeworks_base-b70765cc27a174d1d4a0bab7062733ebd3eae354.zip
frameworks_base-b70765cc27a174d1d4a0bab7062733ebd3eae354.tar.gz
frameworks_base-b70765cc27a174d1d4a0bab7062733ebd3eae354.tar.bz2
Decouple Tethering UI with registering of SDP records.
This can lead to usability issues, since the SDP record will get registered later on. Change-Id: Ifda78a3831572f1b9955bf06da9a8b0e949942aa
Diffstat (limited to 'core/java/android/server/BluetoothEventLoop.java')
-rw-r--r--core/java/android/server/BluetoothEventLoop.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index 9436fec..48a2b72 100644
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -644,7 +644,8 @@ class BluetoothEventLoop {
} else {
Log.i(TAG, "Rejecting incoming HID connection from " + address);
}
- } else if (BluetoothUuid.isBnep(uuid) || BluetoothUuid.isNap(uuid)){
+ } else if (BluetoothUuid.isBnep(uuid) || BluetoothUuid.isNap(uuid) &&
+ mBluetoothService.isTetheringOn()){
authorized = true;
} else {
Log.i(TAG, "Rejecting incoming " + deviceUuid + " connection from " + address);