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

Commit 76fdaeb9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix bugprone-use-after-move warnings" into rvc-dev-plus-aosp am: 8c6d5a4e 

Change-Id: I7eb673ffb29783ead221973c064455bad1faa00d
parents 7f37110b 8c6d5a4e

libs/androidfw/ApkAssets.cpp

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ std::unique_ptr<const ApkAssets> ApkAssets::LoadOverlay(const std::string& idmap 
    return {};

  }



  return LoadImpl({} /*fd*/, loaded_idmap->OverlayApkPath(),

  auto apkPath = loaded_idmap->OverlayApkPath();

  return LoadImpl({} /*fd*/, apkPath,

                  std::move(idmap_asset),

                  std::move(loaded_idmap),

                  PROPERTY_OVERLAY | (system ? PROPERTY_SYSTEM : 0U));