summaryrefslogtreecommitdiff
path: root/contexthubhal/system_comms.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'contexthubhal/system_comms.cpp')
-rw-r--r--contexthubhal/system_comms.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/contexthubhal/system_comms.cpp b/contexthubhal/system_comms.cpp
index 87e5feef..30106995 100644
--- a/contexthubhal/system_comms.cpp
+++ b/contexthubhal/system_comms.cpp
@@ -1015,8 +1015,8 @@ bool SystemComm::AppManager::saveApps()
}
// Write the JSON string to disk.
- Json::StyledWriter writer;
- std::string serializedSettings(writer.write(*appsObject));
+ Json::StreamWriterBuilder factory;
+ std::string serializedSettings(Json::writeString(factory, *appsObject));
size_t size = serializedSettings.size();
if ((err = saved_apps_file.write(serializedSettings.c_str(), size)) != (ssize_t)size) {
ALOGW("saved_apps file write failed %d (%s)",
@@ -1050,8 +1050,10 @@ bool SystemComm::AppManager::restoreApps()
std::string str(buf);
std::shared_ptr<Json::Value> in(new Json::Value);
- Json::Reader reader;
- bool valid = reader.parse(str, *in);
+ Json::CharReaderBuilder builder;
+ std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
+ bool valid = reader->parse(
+ str.data(), str.data() + str.size(), in.get(), /* errorMessage = */ nullptr);
free(buf);
if (valid && in->isObject()) {