fix SurfaceFlinger DDMS debugging
DdmHandleAppName.setAppName() signature changed which broke
this debugging feature.
Needed for debugging b\7267680
Change-Id: I4482bf5a441e91bef89d1ddea9a4152333be7f88
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 6db89f0..0d559e7 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -3,7 +3,6 @@
LOCAL_SRC_FILES:= \
Client.cpp \
- DdmConnection.cpp \
DisplayDevice.cpp \
EventThread.cpp \
Layer.cpp \
@@ -58,6 +57,8 @@
# 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
diff --git a/services/surfaceflinger/DdmConnection.cpp b/services/surfaceflinger/DdmConnection.cpp
index ece965c..d2c977d 100644
--- a/services/surfaceflinger/DdmConnection.cpp
+++ b/services/surfaceflinger/DdmConnection.cpp
@@ -78,10 +78,10 @@
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);
}
}