summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-05-06 16:17:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-06 16:17:13 +0000
commitebb9e69513b690881a5bad7bf45c6f32e0fc7062 (patch)
tree2be96fe2750c81770e81b74a6831b0f05c071364 /libs
parent594b9dcc1a4c3e3c554d71b32bab7dc61979a50d (diff)
parente4280baaa709c74d86cf6a389a4674ca665f5af6 (diff)
downloadframeworks_base-ebb9e69513b690881a5bad7bf45c6f32e0fc7062.zip
frameworks_base-ebb9e69513b690881a5bad7bf45c6f32e0fc7062.tar.gz
frameworks_base-ebb9e69513b690881a5bad7bf45c6f32e0fc7062.tar.bz2
Merge "Implement loadSystemProperties"
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/renderthread/RenderProxy.cpp13
-rw-r--r--libs/hwui/renderthread/RenderProxy.h1
2 files changed, 14 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index 31bb61a..c2806fa 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -98,6 +98,19 @@ void RenderProxy::setFrameInterval(nsecs_t frameIntervalNanos) {
post(task);
}
+CREATE_BRIDGE0(loadSystemProperties) {
+ bool needsRedraw = false;
+ if (Caches::hasInstance()) {
+ needsRedraw = Caches::getInstance().initProperties();
+ }
+ return (void*) needsRedraw;
+}
+
+bool RenderProxy::loadSystemProperties() {
+ SETUP_TASK(loadSystemProperties);
+ return (bool) postAndWait(task);
+}
+
CREATE_BRIDGE2(initialize, CanvasContext* context, EGLNativeWindowType window) {
return (void*) args->context->initialize(args->window);
}
diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h
index 984cc65..013c3bd 100644
--- a/libs/hwui/renderthread/RenderProxy.h
+++ b/libs/hwui/renderthread/RenderProxy.h
@@ -61,6 +61,7 @@ public:
ANDROID_API virtual ~RenderProxy();
ANDROID_API void setFrameInterval(nsecs_t frameIntervalNanos);
+ ANDROID_API bool loadSystemProperties();
ANDROID_API bool initialize(const sp<ANativeWindow>& window);
ANDROID_API void updateSurface(const sp<ANativeWindow>& window);