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

Commit 16db66ff authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix bugprone-use-after-move warnings" am: e201a4bc 

Change-Id: I1eef88c9d6c4095e50666a48a8955cc7b5e3a45f
parents d6276866 e201a4bc

core/jni/android_content_res_ApkAssets.cpp

+2 −1
Original line number Diff line number Diff line
@@ -78,12 +78,13 @@ 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);

  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;

  }