diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-08-04 11:28:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-04 11:28:55 -0700 |
| commit | 737998f5955aa14f1b21967f6f559bca60cb1844 (patch) | |
| tree | d0dc791a67102b0acbaf8336cba6a3b5408e4da2 /core | |
| parent | d89443d86603dbc9e02e1db32b9071780b4702bc (diff) | |
| parent | 6eb300e650a0e3ca0e802203e1718ab5abbb7ce9 (diff) | |
| download | frameworks_base-737998f5955aa14f1b21967f6f559bca60cb1844.zip frameworks_base-737998f5955aa14f1b21967f6f559bca60cb1844.tar.gz frameworks_base-737998f5955aa14f1b21967f6f559bca60cb1844.tar.bz2 | |
Merge "Add Blocked Device property." into gingerbread
Diffstat (limited to 'core')
| -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 9a8f1b8..43c3a95 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}, |