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

Commit b7190e18 authored by Scott Randolph's avatar Scott Randolph Committed by android-build-merger
Browse files

Merge "Use explicit .c_str() for hidl_string" into oc-dev 

am: 0576064b

Change-Id: I6fe3aef2e5c18e8bcc9fb03b4800fc7f8d9c66ab
parents 1f3a56ef 0576064b

services/core/jni/com_android_server_location_ContextHubService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -929,15 +929,15 @@ jobject constructJContextHubInfo(JNIEnv *env, const ContextHub &hub) { 
                                  db.jniInfo.contextHubInfoCtor);

    env->CallVoidMethod(jHub, db.jniInfo.contextHubInfoSetId, hub.hubId);



    jstrBuf = env->NewStringUTF(hub.name);

    jstrBuf = env->NewStringUTF(hub.name.c_str());

    env->CallVoidMethod(jHub, db.jniInfo.contextHubInfoSetName, jstrBuf);

    env->DeleteLocalRef(jstrBuf);



    jstrBuf = env->NewStringUTF(hub.vendor);

    jstrBuf = env->NewStringUTF(hub.vendor.c_str());

    env->CallVoidMethod(jHub, db.jniInfo.contextHubInfoSetVendor, jstrBuf);

    env->DeleteLocalRef(jstrBuf);



    jstrBuf = env->NewStringUTF(hub.toolchain);

    jstrBuf = env->NewStringUTF(hub.toolchain.c_str());

    env->CallVoidMethod(jHub, db.jniInfo.contextHubInfoSetToolchain, jstrBuf);

    env->DeleteLocalRef(jstrBuf);