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

Fix bugprone-use-after-move warnings

Browse Source 
Bug: 150783499
Test: WITH_TIDY=1 make
Change-Id: I745d8bfde00a77bcdbbeaa21cfe81af1c74a971c
Merged-In: I745d8bfde00a77bcdbbeaa21cfe81af1c74a971c
This commit is contained in:
Chih-Hung Hsieh
2020-03-06 14:52:28 -08:00
committed by Ryan Mitchell
parent e35e87f514
commit ad2d924b34
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;
}