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: e201a4bc57 am: 16db66ffa6

Browse Source 
Change-Id: Ia07e7e9b667371d032540991d60135d13d86fb57
This commit is contained in:
Automerger Merge Worker
2020-03-17 19:28:04 +00:00
parent 9295e029b4 16db66ffa6
commit 88ca34ef5f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_content_res_ApkAssets.cpp
View File

@@ -85,6 +85,7 @@ static jlong NativeLoadFromFd(JNIEnv* env, jclass /*clazz*/, jobject file_descri
return 0;
}
auto dup_fd_id = dup_fd.get();
std::unique_ptr<const ApkAssets> apk_assets = ApkAssets::LoadFromFd(std::move(dup_fd),
friendly_name_utf8.c_str(),
system, force_shared_lib,
@@ -92,7 +93,7 @@ static jlong NativeLoadFromFd(JNIEnv* env, jclass /*clazz*/, jobject file_descri
if (apk_assets == nullptr) {
std::string error_msg = base::StringPrintf("Failed to load asset path %s from fd %d",
friendly_name_utf8.c_str(), dup_fd.get());
friendly_name_utf8.c_str(), dup_fd_id);
jniThrowException(env, "java/io/IOException", error_msg.c_str());
return 0;
}