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

Commit 93945f2c authored by Scott Randolph's avatar Scott Randolph
Browse files

Use explicit .c_str() for hidl_string 

hidl_string no longer will provide an implicit cast to const char* as it
interfers with other expected behaviors of the class.  It now emulated
std::string in requiring a call to .c_str() to get the same behavior.

Bug:  36532780
Test:  Build the tree
Change-Id: I86f4b7ef9e20674299519bd421d833b5d858ac6a
parent 2ac96982

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);