commit 06670e75e517399fe5c0659d53157560b52193a6
author Haibo Huang <hhb@google.com> Wed Mar 03 10:49:15 2021 -0800
committer Haibo Huang <hhb@google.com> Wed Mar 03 16:32:03 2021 -0800
tree 8d9c5d8df5b9ba8746cfd57a8a2048c28d401c08
parent f13087081087d363a930b477176ff582a651663d

[contexthub] Use new jsoncpp API

Reader / StyledWriter are deprecated upstream

Bug: 170642246
Change-Id: Id48592c7ef47392910b771e0da4d1d306b3424d8

contexthubhal/system_comms.cpp

diff --git a/contexthubhal/system_comms.cpp b/contexthubhal/system_comms.cpp
index 87e5fee..3010699 100644
--- a/contexthubhal/system_comms.cpp
+++ b/contexthubhal/system_comms.cpp
@@ -1015,8 +1015,8 @@
     }
 
     // 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 @@
 
         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()) {