Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b482ee6d authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Automerger Merge Worker
Browse files

Fix bugprone-use-after-move warnings am: ad2d924b am: e2960720 

Change-Id: I7a96d7f0e69e0793fe71bb1c727b6e55392effb3
parents 7c319788 e2960720

core/jni/android_content_res_ApkAssets.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;

  }