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

Merge "Fix bugprone-use-after-move warnings"

Browse Source
This commit is contained in:
Chih-hung Hsieh
2020-03-17 18:34:53 +00:00
committed by Gerrit Code Review
parent e696f45471 243bc1929b
commit 0dbbb661cf
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; LOG(ERROR) << "failed to load IDMAP " << idmap_path;
return {}; return {};
} }
return LoadImpl({} /*fd*/, loaded_idmap->OverlayApkPath(), std::move(idmap_asset), auto apkPath = loaded_idmap->OverlayApkPath();
std::move(loaded_idmap), system, false /*load_as_shared_library*/); 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, std::unique_ptr<const ApkAssets> ApkAssets::LoadFromFd(unique_fd fd,