am eb38d852: am 1b3aeb48: fix SurfaceFlinger DDMS debugging

* commit 'eb38d85260073470e5a27af820fe6cd9f2bc35ae':
  fix SurfaceFlinger DDMS debugging
This commit is contained in:
Mathias Agopian 2012-10-07 23:41:57 -07:00 committed by Android Git Automerger
commit 4dae9ebd80
2 changed files with 4 additions and 3 deletions

View File

@ -3,7 +3,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
Client.cpp \ Client.cpp \
DdmConnection.cpp \
DisplayDevice.cpp \ DisplayDevice.cpp \
EventThread.cpp \ EventThread.cpp \
Layer.cpp \ Layer.cpp \
@ -58,6 +57,8 @@ include $(BUILD_SHARED_LIBRARY)
# uses jni which may not be available in PDK # uses jni which may not be available in PDK
ifneq ($(wildcard libnativehelper/include),) ifneq ($(wildcard libnativehelper/include),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
DdmConnection.cpp DdmConnection.cpp

View File

@ -78,10 +78,10 @@ void DdmConnection::start(const char* name) {
startClass = env->FindClass("android/ddm/DdmHandleAppName"); startClass = env->FindClass("android/ddm/DdmHandleAppName");
if (startClass) { if (startClass) {
startMeth = env->GetStaticMethodID(startClass, startMeth = env->GetStaticMethodID(startClass,
"setAppName", "(Ljava/lang/String;)V"); "setAppName", "(Ljava/lang/String;I)V");
if (startMeth) { if (startMeth) {
jstring str = env->NewStringUTF(name); jstring str = env->NewStringUTF(name);
env->CallStaticVoidMethod(startClass, startMeth, str); env->CallStaticVoidMethod(startClass, startMeth, str, getuid());
env->DeleteLocalRef(str); env->DeleteLocalRef(str);
} }
} }