summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-09-10 21:00:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-10 21:00:37 +0000
commit895a43751fcf4f33e5437963d75d05c2cd754520 (patch)
treefdd85785e5206d42533cf3dd135174f92a481461
parentb776122a8aa9fd082fa8aaa216c8a589d709c4c9 (diff)
parent7a454ba5fee0bbb9f2e1292f8eede655516c0f2c (diff)
downloadframeworks_base-895a43751fcf4f33e5437963d75d05c2cd754520.zip
frameworks_base-895a43751fcf4f33e5437963d75d05c2cd754520.tar.gz
frameworks_base-895a43751fcf4f33e5437963d75d05c2cd754520.tar.bz2
Merge "Fix FontRenderer bug." into klp-dev
-rw-r--r--libs/hwui/FontRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index e8456af..7e99a5f 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -732,7 +732,7 @@ 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)) {
+ if (!mRs->init(RSC::RS_INIT_LOW_LATENCY | RSC::RS_INIT_SYNCHRONOUS)) {
ALOGE("blur RS failed to init");
}