Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 737998f5: Merge "Add Blocked Device property." into gingerbread

Browse Source 
Merge commit '737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp

* commit '737998f5955aa14f1b21967f6f559bca60cb1844':
  Add Blocked Device property.
This commit is contained in:
Jaikumar Ganesh
2010-08-04 11:36:03 -07:00
committed by Android Git Automerger
parent c1b387aed8 737998f595
commit c4ed734bd8
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/android_bluetooth_common.cpp
View File

@@ -46,6 +46,7 @@ static Properties remote_device_properties[] = {
{"Paired", DBUS_TYPE_BOOLEAN}, {"Paired", DBUS_TYPE_BOOLEAN},
{"Connected", DBUS_TYPE_BOOLEAN}, {"Connected", DBUS_TYPE_BOOLEAN},
{"Trusted", DBUS_TYPE_BOOLEAN}, {"Trusted", DBUS_TYPE_BOOLEAN},
{"Blocked", DBUS_TYPE_BOOLEAN},
{"Alias", DBUS_TYPE_STRING}, {"Alias", DBUS_TYPE_STRING},
{"Nodes", DBUS_TYPE_ARRAY}, {"Nodes", DBUS_TYPE_ARRAY},
{"Adapter", DBUS_TYPE_OBJECT_PATH}, {"Adapter", DBUS_TYPE_OBJECT_PATH},