Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I6d2d52c3ea27b86a48a7118211beb199741c13c9
This commit is contained in:
Automerger Merge Worker
2020-03-17 19:12:22 +00:00
parent 9cfecba8cf 0dbbb661cf
commit d6276866bf
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/androidfw/ApkAssets.cpp
View File

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