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

Commit d6276866 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix bugprone-use-after-move warnings" am: 0dbbb661

Change-Id: I6d2d52c3ea27b86a48a7118211beb199741c13c9
parents 9cfecba8 0dbbb661
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -70,8 +70,11 @@ std::unique_ptr<const ApkAssets> ApkAssets::LoadOverlay(const std::string& idmap
    LOG(ERROR) << "failed to load IDMAP " << idmap_path;
    return {};
  }
  return LoadImpl({} /*fd*/, loaded_idmap->OverlayApkPath(), std::move(idmap_asset),
                  std::move(loaded_idmap), system, false /*load_as_shared_library*/);
  auto apkPath = loaded_idmap->OverlayApkPath();
  return LoadImpl({} /*fd*/, apkPath,
                  std::move(idmap_asset),
                  std::move(loaded_idmap),
                  system, false /*load_as_shared_library*/);
}

std::unique_ptr<const ApkAssets> ApkAssets::LoadFromFd(unique_fd fd,