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

Commit 7b967f95 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Call verify in create-multiple" into rvc-dev am: 0c9978cd 

Change-Id: Id34403c100e15d7d4e3d0bae6f23581d4302b056
parents 90d4da0a 0c9978cd

cmds/idmap2/idmap2/CreateMultiple.cpp

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

#include "idmap2/Policies.h"

#include "idmap2/SysTrace.h"

#include "Commands.h"



using android::ApkAssets;

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

    }



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

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

      if (!overlay_apk) {

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

        continue;

      }

    }



    idmap_paths.emplace_back(idmap_path);

  }