From 933c7a612ed94756deb4d8a2a2ba0d2df0c414bc Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Fri, 6 Mar 2020 10:16:11 -0800
Subject: [PATCH] Fix bugprone-use-after-move warnings

Bug: 150783499
Test: WITH_TIDY=1 make
Change-Id: I185cb21521676ddbc4f2b7f098611a2efc7275e6
Merged-In: I185cb21521676ddbc4f2b7f098611a2efc7275e6
(cherry picked from commit c658184d366ee08cedd9ec208ea327530b52bfad)
---
 libs/androidfw/ApkAssets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp
index 18934fd55bade..b2b0ec2a54f8e 100644
--- a/libs/androidfw/ApkAssets.cpp
+++ b/libs/androidfw/ApkAssets.cpp
@@ -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));