diff options
| author | Timothy Jennison <tjennison@google.com> | 2016-03-18 12:24:34 -0400 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2016-03-23 18:51:49 +0000 |
| commit | 0274f77475e79545f318abd1c28fedaf269f095c (patch) | |
| tree | bdfe0395504161c896959c473a7462465691f72a /brillo/dbus | |
| parent | f151b2be0e50d44871444598fd910d3710eb5bee (diff) | |
| download | platform_external_libbrillo-0274f77475e79545f318abd1c28fedaf269f095c.tar.gz platform_external_libbrillo-0274f77475e79545f318abd1c28fedaf269f095c.tar.bz2 platform_external_libbrillo-0274f77475e79545f318abd1c28fedaf269f095c.zip | |
brillo: handle arrays of string maps in dbus serialization
Bug: 26778228
TEST=compiles on chromeos, manual testing of dbus serialization
Change-Id: I3876c4f0263add5d06732af2dc0c05d1b9f4dd54
Diffstat (limited to 'brillo/dbus')
| -rw-r--r-- | brillo/dbus/data_serialization.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/brillo/dbus/data_serialization.cc b/brillo/dbus/data_serialization.cc index 5c1d50e..86d1c63 100644 --- a/brillo/dbus/data_serialization.cc +++ b/brillo/dbus/data_serialization.cc @@ -211,6 +211,9 @@ bool PopArrayValueFromReader(dbus::MessageReader* reader, return PopTypedMapFromReader<std::string, std::string>(reader, value); else if (signature == "a{sv}") return PopTypedValueFromReader<brillo::VariantDictionary>(reader, value); + else if (signature == "aa{ss}") + return PopTypedArrayFromReader< + std::map<std::string, std::string>>(reader, value); else if (signature == "aa{sv}") return PopTypedArrayFromReader<brillo::VariantDictionary>(reader, value); else if (signature == "a{sa{ss}}") |