From 1b3aeb4844fe198c1fb61064d0cec3f5ac63f7d3 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Sun, 7 Oct 2012 16:41:12 -0700 Subject: [PATCH] fix SurfaceFlinger DDMS debugging DdmHandleAppName.setAppName() signature changed which broke this debugging feature. Needed for debugging b\7267680 Change-Id: I4482bf5a441e91bef89d1ddea9a4152333be7f88 --- services/surfaceflinger/Android.mk | 3 ++- services/surfaceflinger/DdmConnection.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 6db89f0a7..0d559e778 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -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 diff --git a/services/surfaceflinger/DdmConnection.cpp b/services/surfaceflinger/DdmConnection.cpp index ece965cf4..d2c977df6 100644 --- a/services/surfaceflinger/DdmConnection.cpp +++ b/services/surfaceflinger/DdmConnection.cpp @@ -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); } }