summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-04-11 19:15:05 -0700
committerJohn Reck <jreck@google.com>2014-04-14 13:17:25 -0700
commit860d155f866cc15a725e7ce03763280987f24901 (patch)
tree1ade6b4f5c2c0910c088469b95255eb66ce0cb53 /core/jni
parentdb8b130a19484cb6018667905e64d42ab793654f (diff)
downloadframeworks_base-860d155f866cc15a725e7ce03763280987f24901.zip
frameworks_base-860d155f866cc15a725e7ce03763280987f24901.tar.gz
frameworks_base-860d155f866cc15a725e7ce03763280987f24901.tar.bz2
Fix issue with bitmap uploading
Bug: 13912749 Change-Id: Ic23fa1d280118dc93dc2716a4a24cc0bbbdca595
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_view_GLRenderer.cpp4
-rw-r--r--core/jni/android_view_HardwareLayer.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_view_GLRenderer.cpp b/core/jni/android_view_GLRenderer.cpp
index 6ae6c8f..d0269a3 100644
--- a/core/jni/android_view_GLRenderer.cpp
+++ b/core/jni/android_view_GLRenderer.cpp
@@ -146,8 +146,8 @@ static void android_view_GLRenderer_prepareTree(JNIEnv* env, jobject clazz,
jlong renderNodePtr) {
using namespace android::uirenderer;
RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr);
- TreeInfo info = {0};
- renderNode->prepareTree(info);
+ TreeInfo ignoredInfo;
+ renderNode->prepareTree(ignoredInfo);
}
static void android_view_GLRenderer_invokeFunctor(JNIEnv* env, jobject clazz,
diff --git a/core/jni/android_view_HardwareLayer.cpp b/core/jni/android_view_HardwareLayer.cpp
index 2eb0d78..b2f17de 100644
--- a/core/jni/android_view_HardwareLayer.cpp
+++ b/core/jni/android_view_HardwareLayer.cpp
@@ -127,8 +127,8 @@ static void android_view_HardwareLayer_updateRenderLayer(JNIEnv* env, jobject cl
static jboolean android_view_HardwareLayer_flushChanges(JNIEnv* env, jobject clazz,
jlong layerUpdaterPtr) {
DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(layerUpdaterPtr);
- bool ignoredHasFunctors;
- return layer->apply(&ignoredHasFunctors);
+ TreeInfo ignoredInfo;
+ return layer->apply(ignoredInfo);
}
static jlong android_view_HardwareLayer_getLayer(JNIEnv* env, jobject clazz,