commit de5fa4c6d888d655df87f53f62099757032c5790
author Xin Li <delphij@google.com> Fri Jun 18 12:24:33 2021 -0700
committer Xin Li <delphij@google.com> Fri Jun 18 12:24:33 2021 -0700
tree b1574433c580e7f7f8c0e8adc39055f63a2d8238
parent a5517e537ec3670a0a58c30c3df7e6a1285e0fa9
parent 4cb13d1ef2d597ece00a18526041b2e5bb6f09d7

DO NOT MERGE - Merge RQ3A.210605.005

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

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");