commit 9532bd2b829440712c3a15f0df867f81f32fa150
author Yifan Hong <elsk@google.com> Fri Apr 14 15:30:52 2017 -0700
committer Yifan Hong <elsk@google.com> Fri Apr 14 17:51:20 2017 -0700
tree 2f3f96f67d4d08c2f0de1bbf276014161984ca9a
parent 143cfe6aa1e257f200829c903be67ed73d141ab2

Add VintfObjectRecovery

A special VintfObject for recovery. CheckCompatibility
knows how to mount /system and /vendor if necessary.

Test: testing with a test CL that replaces graphics test
      into calling android::vintf::details::mountSystem
      / mountVendor, and the partitions are actually
      mounted.

Bug: 36814503
Change-Id: Ie6a8e533841a128a411134973006ac4afb17a78e

VintfObject.cpp

diff --git a/VintfObject.cpp b/VintfObject.cpp
index 00e02dd..674031a 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -73,13 +73,7 @@
 
 namespace details {
 
-static status_t mountSystem() {
-    // TODO(b/36814503): mount system partition here for recovery mode.
-    return OK;
-}
-
-static status_t mountVendor() {
-    // TODO(b/36814503): mount vendor partition here for recovery mode.
+static status_t fakeMountUmount() {
     return OK;
 }
 
@@ -90,7 +84,7 @@
     DUPLICATED_DEV_ENTRY,
 };
 
-std::string toString(ParseStatus status) {
+static std::string toString(ParseStatus status) {
     switch(status) {
         case ParseStatus::OK:                   return "OK";
         case ParseStatus::PARSE_ERROR:          return "parse error";
@@ -101,7 +95,7 @@
 }
 
 template<typename T>
-ParseStatus tryParse(const std::string &xml, const XmlConverter<T> &parse,
+static ParseStatus tryParse(const std::string &xml, const XmlConverter<T> &parse,
         std::unique_ptr<T> *fwk, std::unique_ptr<T> *dev) {
     std::unique_ptr<T> ret = std::make_unique<T>();
     if (!parse(ret.get(), xml)) {
@@ -124,6 +118,7 @@
 template<typename T, typename GetFunction>
 static status_t getMissing(const T *pkg, bool mount,
         std::function<status_t(void)> mountFunction,
+        std::function<status_t(void)> umountFunction,
         const T **updated,
         GetFunction getFunction) {
     if (pkg != nullptr) {
@@ -133,6 +128,9 @@
             (void)mountFunction(); // ignore mount errors
         }
         *updated = getFunction();
+        if (mount) {
+            (void)umountFunction(); // ignore umount errors
+        }
     }
     return OK;
 }
@@ -166,7 +164,9 @@
 // Do compatibility check.
 int32_t checkCompatibility(const std::vector<std::string> &xmls, bool mount,
         std::function<status_t(void)> mountSystem,
+        std::function<status_t(void)> umountSystem,
         std::function<status_t(void)> mountVendor,
+        std::function<status_t(void)> umountVendor,
         std::function<const HalManifest *(bool)> GetFrameworkHalManifest,
         std::function<const HalManifest *(bool)> GetDeviceHalManifest,
         std::function<const RuntimeInfo *(bool)> GetRuntimeInfo,
@@ -205,11 +205,13 @@
     }
 
     // get missing info from device
-    if ((status = getMissing(pkg.fwk.manifest.get(), mount, mountSystem, &updated.fwk.manifest,
+    if ((status = getMissing(pkg.fwk.manifest.get(), mount, mountSystem, umountSystem,
+            &updated.fwk.manifest,
             std::bind(GetFrameworkHalManifest, true /* skipCache */))) != OK) {
         return status;
     }
-    if ((status = getMissing(pkg.dev.manifest.get(), mount, mountVendor, &updated.dev.manifest,
+    if ((status = getMissing(pkg.dev.manifest.get(), mount, mountVendor, umountVendor,
+            &updated.dev.manifest,
             std::bind(GetDeviceHalManifest, true /* skipCache */))) != OK) {
         return status;
     }
@@ -272,10 +274,10 @@
 
 // static
 int32_t VintfObject::CheckCompatibility(
-        const std::vector<std::string> &xmls,
-        bool mount, std::string *error) {
-    return details::checkCompatibility(xmls, mount,
-            &details::mountSystem, &details::mountVendor,
+        const std::vector<std::string> &xmls, std::string *error) {
+    return details::checkCompatibility(xmls, false /* mount */,
+            &details::fakeMountUmount, &details::fakeMountUmount,
+            &details::fakeMountUmount, &details::fakeMountUmount,
             &VintfObject::GetFrameworkHalManifest,
             &VintfObject::GetDeviceHalManifest,
             &VintfObject::GetRuntimeInfo,