diff options
author | John Reck <jreck@google.com> | 2014-10-31 22:55:46 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 22:55:47 +0000 |
commit | a8d83d639a5687b2ab5689db4ea61e2a6cce66f4 (patch) | |
tree | e8441152d52d9388d9db09e039e3797cc2e38295 /core | |
parent | f34fa3e7aa9be9bf24c955a9ebf34022e4b88c25 (diff) | |
parent | 0e89e2b7bcb2c035e8cee77f93120e7c5617f8d2 (diff) | |
download | frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.zip frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.tar.gz frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.tar.bz2 |
Merge "Layer changes" into lmp-mr1-dev
Diffstat (limited to 'core')
-rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 2e2b23f..9bdc6b5 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -43,6 +43,7 @@ #include <RenderNode.h> #include <CanvasProperty.h> #include <Paint.h> +#include <renderthread/RenderProxy.h> #include "MinikinUtils.h" @@ -861,7 +862,7 @@ static void android_app_ActivityThread_dumpGraphics(JNIEnv* env, jobject clazz, jobject javaFileDescriptor) { #ifdef USE_OPENGL_RENDERER int fd = jniGetFDFromFileDescriptor(env, javaFileDescriptor); - android::uirenderer::RenderNode::outputLogBuffer(fd); + android::uirenderer::renderthread::RenderProxy::outputLogBuffer(fd); #endif // USE_OPENGL_RENDERER } |