commit 4cb13d1ef2d597ece00a18526041b2e5bb6f09d7
author Xin Li <delphij@google.com> Mon Jun 14 21:51:48 2021 -0700
committer Xin Li <delphij@google.com> Thu Jun 17 21:19:59 2021 +0000
tree b1574433c580e7f7f8c0e8adc39055f63a2d8238
parent 05a650fd73c1c1660c15fb0eded422341a0d7735
parent 9417ae43528f2ab5aa898cc018ebb1ef7e937843

DO NOT MERGE - Merge ab/7272582

Bug: 190855093
Merged-In: I50c25193281a2ec909bf385f59fdbefeede77e9e
Change-Id: Ica03f77d57a36749b28b287ce178816faafc2e0f

host/msm/daemon/chre_daemon.cc

diff --git a/host/msm/daemon/chre_daemon.cc b/host/msm/daemon/chre_daemon.cc
index f4b7210..e4dba0b 100644
--- a/host/msm/daemon/chre_daemon.cc
+++ b/host/msm/daemon/chre_daemon.cc
@@ -791,12 +791,13 @@
       "/vendor/etc/chre/preloaded_nanoapps.json";
   std::ifstream configFileStream(kPreloadedNanoappsConfigPath);
 
-  Json::Reader reader;
+  Json::CharReaderBuilder builder;
   Json::Value config;
   if (!configFileStream) {
     LOGE("Failed to open config file '%s': %d (%s)",
          kPreloadedNanoappsConfigPath, errno, strerror(errno));
-  } else if (!reader.parse(configFileStream, config)) {
+  } else if (!Json::parseFromStream(builder, configFileStream, &config,
+                                    /* errorMessage = */ nullptr)) {
     LOGE("Failed to parse nanoapp config file");
   } else if (!config.isMember("nanoapps") || !config.isMember("source_dir")) {
     LOGE("Malformed preloaded nanoapps config");