summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tim Murray <timmurray@google.com> 2013-12-18 17:45:37 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-12-18 17:45:37 -0800
commitacf7b5d24a98dc97b551e205bf7638f47d9304c0 (patch)
tree8a7cc3044759bc523ff0d71af38230b0994c1ebe
parentad5ee2f40a1b248aea49657e9f7155daac4cf65e (diff)
parent9dabdaec39836fc800bbdd5ea7b85c3d06889307 (diff)
am 9dabdaec: Merge "Handle user-defined cache path for RS."
* commit '9dabdaec39836fc800bbdd5ea7b85c3d06889307': 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 00e78708dd31..0be17ff868b4 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -732,7 +732,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");
}