diff options
| author | 2010-08-04 11:36:03 -0700 | |
|---|---|---|
| committer | 2010-08-04 11:36:03 -0700 | |
| commit | c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c (patch) | |
| tree | 22f258e4fe18408a93472f27e67f1821bea1d8a1 | |
| parent | c1b387aed8a10031b4fde6d82ab9353d975486b3 (diff) | |
| parent | 737998f5955aa14f1b21967f6f559bca60cb1844 (diff) | |
am 737998f5: Merge "Add Blocked Device property." into gingerbread
Merge commit '737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp
* commit '737998f5955aa14f1b21967f6f559bca60cb1844':
Add Blocked Device property.
| -rw-r--r-- | core/jni/android_bluetooth_common.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android_bluetooth_common.cpp b/core/jni/android_bluetooth_common.cpp index 9a8f1b8881f1..43c3a9518ef7 100644 --- a/core/jni/android_bluetooth_common.cpp +++ b/core/jni/android_bluetooth_common.cpp @@ -46,6 +46,7 @@ static Properties remote_device_properties[] = { {"Paired", DBUS_TYPE_BOOLEAN}, {"Connected", DBUS_TYPE_BOOLEAN}, {"Trusted", DBUS_TYPE_BOOLEAN}, + {"Blocked", DBUS_TYPE_BOOLEAN}, {"Alias", DBUS_TYPE_STRING}, {"Nodes", DBUS_TYPE_ARRAY}, {"Adapter", DBUS_TYPE_OBJECT_PATH}, |