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

Commit 64441287 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497



Change-Id: Ib747577c2c8d235e5f3d7ecb717b54fb688013a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36dc0ec7 b370693c

cmds/idmap2/libidmap2/XmlParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ Result<std::string> GetStringValue(const ResXMLParser& parser, const Res_value& 
  switch (value.dataType) {

    case Res_value::TYPE_STRING: {

      if (auto str = parser.getStrings().string8ObjectAt(value.data); str.ok()) {

        return std::string(str->string());

        return std::string(str->c_str());

      }

      break;

    }

core/jni/android_content_res_ObbScanner.cpp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void android_content_res_ObbScanner_getObbInfo(JNIEnv* env, jobject clazz 


    env->ReleaseStringUTFChars(file, filePath);



    const char* packageNameStr = obb->getPackageName().string();

    const char* packageNameStr = obb->getPackageName().c_str();



    jstring packageName = env->NewStringUTF(packageNameStr);

    if (packageName == NULL) {

core/jni/android_util_AssetManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static jobject NativeGetAssetAllocations(JNIEnv* env, jobject /*clazz*/) { 
  if (alloc.length() <= 0) {

    return nullptr;

  }

  return env->NewStringUTF(alloc.string());

  return env->NewStringUTF(alloc.c_str());

}



static jint NativeGetGlobalAssetManagerCount(JNIEnv* /*env*/, jobject /*clazz*/) {
@@ -429,7 +429,7 @@ static jobjectArray NativeList(JNIEnv* env, jclass /*clazz*/, jlong ptr, jstring 
  }



  for (size_t i = 0; i < file_count; i++) {

    jstring java_string = env->NewStringUTF(asset_dir->getFileName(i).string());

    jstring java_string = env->NewStringUTF(asset_dir->getFileName(i).c_str());



    // Check for errors creating the strings (if malformed or no memory).

    if (env->ExceptionCheck()) {

libs/androidfw/AssetManager.cpp

+67 −67

File changed.

Preview size limit exceeded, changes collapsed.

libs/androidfw/BackupData.cpp

+3 −3
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) 
        k = key;

    }

    if (kIsDebug) {

        ALOGD("Writing header: prefix='%s' key='%s' dataSize=%zu", m_keyPrefix.string(),

                key.string(), dataSize);

        ALOGD("Writing header: prefix='%s' key='%s' dataSize=%zu", m_keyPrefix.c_str(),

                key.c_str(), dataSize);

    }



    entity_header_v1 header;
@@ -128,7 +128,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) 
    m_pos += amt;



    if (kIsDebug) ALOGI("writing entity header key, %zd bytes", keyLen+1);

    amt = write(m_fd, k.string(), keyLen+1);

    amt = write(m_fd, k.c_str(), keyLen+1);

    if (amt != keyLen+1) {

        m_status = errno;

        return m_status;