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

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

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

Change-Id: I28e95bcaebc1b4cf70a583c500e64c141ef946da
parents 70766baf d6276866

libs/androidfw/ApkAssets.cpp

+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,