Merge "Fix bugprone-use-after-move warnings" am: e201a4bc57 am: 16db66ffa6 am: 88ca34ef5f (08205a7e) · Commits · e / os / android_frameworks_base

core/jni/android_content_res_ApkAssets.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,7 @@ static jlong NativeLoadFromFd(JNIEnv* env, jclass /clazz/, jobject file_descri
	return 0;		return 0;
	}		}

			auto dup_fd_id = dup_fd.get();
	std::unique_ptr<const ApkAssets> apk_assets = ApkAssets::LoadFromFd(std::move(dup_fd),		std::unique_ptr<const ApkAssets> apk_assets = ApkAssets::LoadFromFd(std::move(dup_fd),
	friendly_name_utf8.c_str(),		friendly_name_utf8.c_str(),
	system, force_shared_lib,		system, force_shared_lib,
	@@ -92,7 +93,7 @@ static jlong NativeLoadFromFd(JNIEnv* env, jclass /clazz/, jobject file_descri

	if (apk_assets == nullptr) {		if (apk_assets == nullptr) {
	std::string error_msg = base::StringPrintf("Failed to load asset path %s from fd %d",		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());		jniThrowException(env, "java/io/IOException", error_msg.c_str());
	return 0;		return 0;
	}		}