commit d520e80fc01dea9ce96ea7945899e3252ce1e572
author Jooyung Han <jooyung@google.com> Tue Mar 03 02:56:34 2020 +0900
committer Jooyung Han <jooyung@google.com> Tue Mar 03 03:02:31 2020 +0900
tree d5457ebf1e8147e2d2234452483b0134c297fdb1
parent 86a7dac37bb045f51b708fc42d655e5e8fc1146f

installd: fix build-error

These were introduced by ag/10417175(use std::optional for AIDL
@nullable in C++)  because some part of code was guarded by macro
ENABLE_STORAGE_CRATES.

Bug: 150584011
Test: m (after ag/10467569, which enables ENABLE_STORAGE_CRATES)
Change-Id: Ia2d7d9ff57381ffe99779649ff572fbbe1044e10

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 26f9d79..eea9718 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -2178,7 +2178,7 @@
 #if CRATE_DEBUG
     LOG(WARNING) << "retVector.size() =" << retVector.size();
     for (auto& item : retVector) {
-        CrateManager::dump(item);
+        CrateManager::dump(*item);
     }
 #endif
 
@@ -2210,7 +2210,7 @@
         if (cratedFolder == nullptr) {
             return;
         }
-        retVector->push_back(std::move(crateMetadata));
+        retVector.push_back(std::move(crateMetadata));
     };
 
     std::function<void(FTSENT*)> onHandingPackage = [&](FTSENT* packageDir) -> void {
@@ -2222,7 +2222,7 @@
 #if CRATE_DEBUG
     LOG(DEBUG) << "retVector.size() =" << retVector.size();
     for (auto& item : retVector) {
-        CrateManager::dump(item);
+        CrateManager::dump(*item);
     }
 #endif