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

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

Merge "Use String8/16 c_str [graphics]" into main am: 9ba8706b am: ddf73385 am: 1624ad46 

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



Change-Id: If7d1ffee9cfcb602101aa27c6e18803e10e95580
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 709104ff 1624ad46

core/jni/AndroidRuntime.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -352,7 +352,7 @@ status_t AndroidRuntime::callMain(const String8& className, jclass clazz, 
    JNIEnv* env;

    JNIEnv* env;

    jmethodID methodId;

    jmethodID methodId;





    ALOGD("Calling main entry %s", className.string());

    ALOGD("Calling main entry %s", className.c_str());





    env = getJNIEnv();

    env = getJNIEnv();

    if (clazz == NULL || env == NULL) {

    if (clazz == NULL || env == NULL) {
@@ -361,7 +361,7 @@ status_t AndroidRuntime::callMain(const String8& className, jclass clazz, 




    methodId = env->GetStaticMethodID(clazz, "main", "([Ljava/lang/String;)V");

    methodId = env->GetStaticMethodID(clazz, "main", "([Ljava/lang/String;)V");

    if (methodId == NULL) {

    if (methodId == NULL) {

        ALOGE("ERROR: could not find method %s.main(String[])\n", className.string());

        ALOGE("ERROR: could not find method %s.main(String[])\n", className.c_str());

        return UNKNOWN_ERROR;

        return UNKNOWN_ERROR;

    }

    }
@@ -377,7 +377,7 @@ status_t AndroidRuntime::callMain(const String8& className, jclass clazz, 
    strArray = env->NewObjectArray(numArgs, stringClass, NULL);

    strArray = env->NewObjectArray(numArgs, stringClass, NULL);





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

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

        jstring argStr = env->NewStringUTF(args[i].string());

        jstring argStr = env->NewStringUTF(args[i].c_str());

        env->SetObjectArrayElement(strArray, i, argStr);

        env->SetObjectArrayElement(strArray, i, argStr);

    }

    }
@@ -1268,7 +1268,7 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options 
    env->SetObjectArrayElement(strArray, 0, classNameStr);

    env->SetObjectArrayElement(strArray, 0, classNameStr);





    for (size_t i = 0; i < options.size(); ++i) {

    for (size_t i = 0; i < options.size(); ++i) {

        jstring optionsStr = env->NewStringUTF(options.itemAt(i).string());

        jstring optionsStr = env->NewStringUTF(options.itemAt(i).c_str());

        assert(optionsStr != NULL);

        assert(optionsStr != NULL);

        env->SetObjectArrayElement(strArray, i + 1, optionsStr);

        env->SetObjectArrayElement(strArray, i + 1, optionsStr);

    }

    }

core/jni/android_view_DisplayEventReceiver.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -292,7 +292,7 @@ static jlong nativeInit(JNIEnv* env, jclass clazz, jobject receiverWeak, jobject 
    if (status) {

    if (status) {

        String8 message;

        String8 message;

        message.appendFormat("Failed to initialize display event receiver.  status=%d", status);

        message.appendFormat("Failed to initialize display event receiver.  status=%d", status);

        jniThrowRuntimeException(env, message.string());

        jniThrowRuntimeException(env, message.c_str());

        return 0;

        return 0;

    }

    }
@@ -316,7 +316,7 @@ static void nativeScheduleVsync(JNIEnv* env, jclass clazz, jlong receiverPtr) { 
    if (status) {

    if (status) {

        String8 message;

        String8 message;

        message.appendFormat("Failed to schedule next vertical sync pulse.  status=%d", status);

        message.appendFormat("Failed to schedule next vertical sync pulse.  status=%d", status);

        jniThrowRuntimeException(env, message.string());

        jniThrowRuntimeException(env, message.c_str());

    }

    }

}

}

core/jni/android_view_InputEventSender.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -334,7 +334,7 @@ static jlong nativeInit(JNIEnv* env, jclass clazz, jobject senderWeak, 
    if (status) {

    if (status) {

        String8 message;

        String8 message;

        message.appendFormat("Failed to initialize input event sender.  status=%d", status);

        message.appendFormat("Failed to initialize input event sender.  status=%d", status);

        jniThrowRuntimeException(env, message.string());

        jniThrowRuntimeException(env, message.c_str());

        return 0;

        return 0;

    }

    }

libs/hwui/RenderNode.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ public: 
        return mDisplayList.containsProjectionReceiver();

        return mDisplayList.containsProjectionReceiver();

    }

    }





    const char* getName() const { return mName.string(); }

    const char* getName() const { return mName.c_str(); }





    void setName(const char* name) {

    void setName(const char* name) {

        if (name) {

        if (name) {

libs/hwui/pipeline/skia/SkiaPipeline.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -200,7 +200,7 @@ bool SkiaPipeline::createOrUpdateLayer(RenderNode* node, const DamageAccumulator 
            String8 cachesOutput;

            String8 cachesOutput;

            mRenderThread.cacheManager().dumpMemoryUsage(cachesOutput,

            mRenderThread.cacheManager().dumpMemoryUsage(cachesOutput,

                                                         &mRenderThread.renderState());

                                                         &mRenderThread.renderState());

            ALOGE("%s", cachesOutput.string());

            ALOGE("%s", cachesOutput.c_str());

            if (errorHandler) {

            if (errorHandler) {

                std::ostringstream err;

                std::ostringstream err;

                err << "Unable to create layer for " << node->getName();

                err << "Unable to create layer for " << node->getName();