summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-12-13 22:39:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-12-13 22:39:36 +0000
commita038bb402b7409fbb60e7ceceb83a4229e56b585 (patch)
treec3651b14c77e85ed36215559ca4d88b3384a70cb
parent18809c063b89d9b235401d080b952885a4ef9628 (diff)
parentabe55e92241fd9a19885f7b11db8d3043ab60c61 (diff)
downloadframeworks_base-a038bb402b7409fbb60e7ceceb83a4229e56b585.zip
frameworks_base-a038bb402b7409fbb60e7ceceb83a4229e56b585.tar.gz
frameworks_base-a038bb402b7409fbb60e7ceceb83a4229e56b585.tar.bz2
Merge "Handle user-defined cache path for RS."
-rw-r--r--libs/hwui/FontRenderer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 48613fe..f7493a3 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -733,7 +733,9 @@ void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, int
if (mRs == 0) {
mRs = new RSC::RS();
- if (!mRs->init(RSC::RS_INIT_LOW_LATENCY | RSC::RS_INIT_SYNCHRONOUS)) {
+ // a null path is OK because there are no custom kernels used
+ // hence nothing gets cached by RS
+ if (!mRs->init("", RSC::RS_INIT_LOW_LATENCY | RSC::RS_INIT_SYNCHRONOUS)) {
ALOGE("blur RS failed to init");
}