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

Commit 8027876f authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Refactor String8 to std::string calls 

DisplayViewport::uniqueId is now std::string, so change the calls
appropriately. Do some additional cleanups and conversions.
This almost completely removes the dependency on String8.

Test: build only
Bug: 111108021
Change-Id: Ibbb6ca59e9061954d4a5fb930ef03d42cb0230db
parent 89b325a9

core/jni/android_hardware_display_DisplayViewport.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ status_t android_hardware_display_DisplayViewport_toNative(JNIEnv* env, jobject 
    jstring uniqueId =

            jstring(env->GetObjectField(viewportObj, gDisplayViewportClassInfo.uniqueId));

    if (uniqueId != nullptr) {

        viewport->uniqueId.setTo(ScopedUtfChars(env, uniqueId).c_str());

        viewport->uniqueId = ScopedUtfChars(env, uniqueId).c_str();

    }



    jobject logicalFrameObj =

core/jni/android_view_InputDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ static struct { 
} gInputDeviceClassInfo;



jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& deviceInfo) {

    ScopedLocalRef<jstring> nameObj(env, env->NewStringUTF(deviceInfo.getDisplayName().string()));

    ScopedLocalRef<jstring> nameObj(env, env->NewStringUTF(deviceInfo.getDisplayName().c_str()));

    if (!nameObj.get()) {

        return NULL;

    }



    ScopedLocalRef<jstring> descriptorObj(env,

            env->NewStringUTF(deviceInfo.getIdentifier().descriptor.string()));

            env->NewStringUTF(deviceInfo.getIdentifier().descriptor.c_str()));

    if (!descriptorObj.get()) {

        return NULL;

    }

libs/input/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ cc_library_shared { 


    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],



}

libs/input/PointerController.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <utils/BitSet.h>

#include <utils/RefBase.h>

#include <utils/Looper.h>

#include <utils/String8.h>

#include <gui/DisplayEventReceiver.h>



namespace android {

libs/input/SpriteController.cpp

+0 −4
Original line number Diff line number Diff line
@@ -23,14 +23,10 @@ 
#include <utils/String8.h>

#include <gui/Surface.h>



// ToDo: Fix code to be warning free

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-parameter"

#include <SkBitmap.h>

#include <SkCanvas.h>

#include <SkColor.h>

#include <SkPaint.h>

#pragma GCC diagnostic pop



#include <android/native_window.h>