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

Commit 4959811f authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Android (Google) Code Review
Browse files

Merge "Revert "Prefer ScopedUtfChars where possible""

parents 24a95430 2df4e1b3

core/jni/android_hardware_input_InputApplicationHandle.cpp

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#define LOG_TAG "InputApplicationHandle"



#include <nativehelper/JNIHelp.h>

#include "nativehelper/scoped_utf_chars.h"

#include "jni.h"

#include <android_runtime/AndroidRuntime.h>

#include <utils/threads.h>
@@ -65,8 +64,9 @@ bool NativeInputApplicationHandle::updateInfo() { 
    jstring nameObj = jstring(env->GetObjectField(obj,

            gInputApplicationHandleClassInfo.name));

    if (nameObj) {

        ScopedUtfChars nameChars(env, nameObj);

        mInfo->name = nameChars.c_str();

        const char* nameStr = env->GetStringUTFChars(nameObj, NULL);

        mInfo->name = nameStr;

        env->ReleaseStringUTFChars(nameObj, nameStr);

        env->DeleteLocalRef(nameObj);

    } else {

        mInfo->name = "<null>";

core/jni/android_hardware_input_InputWindowHandle.cpp

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#define LOG_TAG "InputWindowHandle"



#include <nativehelper/JNIHelp.h>

#include "nativehelper/scoped_utf_chars.h"

#include "jni.h"

#include <android_runtime/AndroidRuntime.h>

#include <utils/threads.h>
@@ -103,8 +102,9 @@ bool NativeInputWindowHandle::updateInfo() { 
    jstring nameObj = jstring(env->GetObjectField(obj,

            gInputWindowHandleClassInfo.name));

    if (nameObj) {

        ScopedUtfChars nameChars(env, nameObj);

        mInfo->name = nameChars.c_str();

        const char* nameStr = env->GetStringUTFChars(nameObj, NULL);

        mInfo->name = nameStr;

        env->ReleaseStringUTFChars(nameObj, nameStr);

        env->DeleteLocalRef(nameObj);

    } else {

        mInfo->name = "<null>";

core/jni/android_view_InputChannel.cpp

+4 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "InputChannel-JNI"



#include <nativehelper/JNIHelp.h>

#include "nativehelper/scoped_utf_chars.h"



#include <android_runtime/AndroidRuntime.h>

#include <binder/Parcel.h>

#include <utils/Log.h>
@@ -123,8 +123,9 @@ static jobject android_view_InputChannel_createInputChannel(JNIEnv* env, 


static jobjectArray android_view_InputChannel_nativeOpenInputChannelPair(JNIEnv* env,

        jclass clazz, jstring nameObj) {

    ScopedUtfChars nameChars(env, nameObj);

    std::string name = nameChars.c_str();

    const char* nameChars = env->GetStringUTFChars(nameObj, NULL);

    std::string name = nameChars;

    env->ReleaseStringUTFChars(nameObj, nameChars);



    sp<InputChannel> serverChannel;

    sp<InputChannel> clientChannel;