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

Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c'

* commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c':
  Add Blocked Device property.
This commit is contained in:
Jaikumar Ganesh
2010-08-05 11:45:44 -07:00
committed by Android Git Automerger

View File

@@ -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},