From e35e87f51453849f78a3be41a25e1257820eda5a Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Thu, 19 Mar 2020 16:57:50 -0700 Subject: Fix bugprone-use-after-move warnings Bug: 150783499 Test: WITH_TIDY=1 make Change-Id: I185cb21521676ddbc4f2b7f098611a2efc7275e6 (cherry picked from commit c658184d366ee08cedd9ec208ea327530b52bfad) Merged-In: I185cb21521676ddbc4f2b7f098611a2efc7275e6 --- libs/androidfw/ApkAssets.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs/androidfw/ApkAssets.cpp') diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index 18934fd55bad..b2b0ec2a54f8 100644 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -77,7 +77,8 @@ std::unique_ptr 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)); -- cgit v1.2.3-59-g8ed1b