From c5ba7e6da1a053ec9e90458e43a9b9eb5c947dfa Mon Sep 17 00:00:00 2001
From: Alex Vakulenko <avakulenko@google.com>
Date: Thu, 28 Jan 2016 14:43:22 -0800
Subject: [PATCH] ledflasher: Removing brillo::Any from weaved's public APIs
Weaved replaces brillo::Any with base::Value in its client library,
so need to update clients.
Also this removes last D-Bus dependencies from ledflasher.
Bug: 26558300
Change-Id: I8265e06aca6f707dde6edbebeafe0b28b8eb17ff
---
src/ledflasher/Android.mk | 3 ---
src/ledflasher/ledflasher.cpp | 7 +++----
src/ledflasher/ledflasher.rc | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/ledflasher/Android.mk b/src/ledflasher/Android.mk
index c385423..fde8150 100644
--- a/src/ledflasher/Android.mk
+++ b/src/ledflasher/Android.mk
@@ -30,11 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
libbinderwrapper \
libbrillo \
libbrillo-binder \
- libbrillo-dbus \
libbrillo-stream \
libchrome \
- libchrome-dbus \
- libdbus \
libutils \
libweaved \
diff --git a/src/ledflasher/ledflasher.cpp b/src/ledflasher/ledflasher.cpp
index 269c5be..de495f3 100644
--- a/src/ledflasher/ledflasher.cpp
+++ b/src/ledflasher/ledflasher.cpp
@@ -274,10 +274,9 @@ void Daemon::UpdateDeviceState() {
if (!weave_service)
return;
- brillo::VariantDictionary state_change{
- {"_ledflasher.status", status_},
- {"_ledflasher.leds", leds},
- };
+ base::DictionaryValue state_change;
+ state_change.SetString("_ledflasher.status", status_);
+ state_change.Set("_ledflasher.leds", brillo::ToValue(leds).release());
weave_service->SetStateProperties(kWeaveComponent, state_change, nullptr);
}
diff --git a/src/ledflasher/ledflasher.rc b/src/ledflasher/ledflasher.rc
index a2c4fe9..8e2ac9d 100644
--- a/src/ledflasher/ledflasher.rc
+++ b/src/ledflasher/ledflasher.rc
@@ -1,4 +1,4 @@
service ledflasher /system/bin/ledflasher
class late_start
user system
- group system dbus
+ group system
--
GitLab