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

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

Merge "Do not run create on successive reboots"

parents e6f86a34 482c75b5

cmds/idmap2/idmap2/Scan.cpp

+1 −7
Original line number Diff line number Diff line
@@ -196,13 +196,7 @@ Result<Unit> Scan(const std::vector<std::string>& args) { 


  std::stringstream stream;

  for (const auto& overlay : interesting_apks) {

    std::vector<std::string> verify_args = {"--idmap-path", overlay.idmap_path};

    for (const std::string& policy : overlay.policies) {

      verify_args.emplace_back("--policy");

      verify_args.emplace_back(policy);

    }



    if (!Verify(std::vector<std::string>(verify_args))) {

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

      std::vector<std::string> create_args = {"--target-apk-path",  target_apk_path,

                                              "--overlay-apk-path", overlay.apk_path,

                                              "--idmap-path",       overlay.idmap_path};