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

Commit 1b3aeb48 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix SurfaceFlinger DDMS debugging 

DdmHandleAppName.setAppName() signature changed which broke
this debugging feature.

Needed for debugging b\7267680

Change-Id: I4482bf5a441e91bef89d1ddea9a4152333be7f88
parent 6d24eef4

services/surfaceflinger/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:= \

    Client.cpp                              \

    DdmConnection.cpp                       \

    DisplayDevice.cpp                       \

    EventThread.cpp                         \

    Layer.cpp                               \
@@ -58,6 +57,8 @@ include $(BUILD_SHARED_LIBRARY) 
# uses jni which may not be available in PDK

ifneq ($(wildcard libnativehelper/include),)

include $(CLEAR_VARS)

LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"



LOCAL_SRC_FILES:= \

    DdmConnection.cpp

services/surfaceflinger/DdmConnection.cpp

+2 −2
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ void DdmConnection::start(const char* name) { 
            startClass = env->FindClass("android/ddm/DdmHandleAppName");

            if (startClass) {

                startMeth = env->GetStaticMethodID(startClass,

                        "setAppName", "(Ljava/lang/String;)V");

                        "setAppName", "(Ljava/lang/String;I)V");

                if (startMeth) {

                    jstring str = env->NewStringUTF(name);

                    env->CallStaticVoidMethod(startClass, startMeth, str);

                    env->CallStaticVoidMethod(startClass, startMeth, str, getuid());

                    env->DeleteLocalRef(str);

                }

            }