summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2011-01-26 17:52:50 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-26 17:52:50 -0800
commit55271a79d1c14e2952d550995569135a23971672 (patch)
tree34342e52693b8e2ff020572ed3f591382920ff34
parentb9d69d595fa17ae87b4e615c2339df64a5df8324 (diff)
parent67a8b8eaa15013c6af9b66a839c9920a8c8f1d9a (diff)
downloadframeworks_base-55271a79d1c14e2952d550995569135a23971672.zip
frameworks_base-55271a79d1c14e2952d550995569135a23971672.tar.gz
frameworks_base-55271a79d1c14e2952d550995569135a23971672.tar.bz2
Merge "Disable PBAP for no voice capability" into honeycomb
-rw-r--r--core/java/android/server/BluetoothService.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index 5608603..115370b 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -617,8 +617,6 @@ public class BluetoothService extends IBluetooth.Stub {
BluetoothUuid.getServiceIdentifierFromParcelUuid(
BluetoothUuid.HSP_AG),
BluetoothUuid.getServiceIdentifierFromParcelUuid(
- BluetoothUuid.PBAP_PSE),
- BluetoothUuid.getServiceIdentifierFromParcelUuid(
BluetoothUuid.ObexObjectPush),
};
mAdapterSdpUuids = uuids;