Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c9978cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Call verify in create-multiple" into rvc-dev

parents 49cd3e5f 625ebd39

cmds/idmap2/idmap2/CreateMultiple.cpp

+29 −26
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "idmap2/Idmap.h"

#include "idmap2/Idmap.h"

#include "idmap2/Policies.h"

#include "idmap2/Policies.h"

#include "idmap2/SysTrace.h"

#include "idmap2/SysTrace.h"

#include "Commands.h"





using android::ApkAssets;

using android::ApkAssets;

using android::base::StringPrintf;

using android::base::StringPrintf;
@@ -105,6 +106,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) { 
      continue;

      continue;

    }

    }





    if (!Verify(std::vector<std::string>({"--idmap-path", idmap_path}))) {

      const std::unique_ptr<const ApkAssets> overlay_apk = ApkAssets::Load(overlay_apk_path);

      const std::unique_ptr<const ApkAssets> overlay_apk = ApkAssets::Load(overlay_apk_path);

      if (!overlay_apk) {

      if (!overlay_apk) {

        LOG(WARNING) << "failed to load apk " << overlay_apk_path.c_str();

        LOG(WARNING) << "failed to load apk " << overlay_apk_path.c_str();
@@ -132,6 +134,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) { 
        LOG(WARNING) << "failed to write to idmap path %s" << idmap_path.c_str();

        LOG(WARNING) << "failed to write to idmap path %s" << idmap_path.c_str();

        continue;

        continue;

      }

      }

    }





    idmap_paths.emplace_back(idmap_path);

    idmap_paths.emplace_back(idmap_path);

  }

  }