summaryrefslogtreecommitdiff
path: root/libs/hwui/FontRenderer.cpp
diff options
context:
space:
mode:
author Tim Murray <timmurray@google.com> 2013-09-10 14:01:53 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-09-10 14:01:53 -0700
commit19c727bbc6371924bfd2f85e804b5b6b093a8413 (patch)
tree2b709c7eede7fe66ffc9c021e61348228f8d8885 /libs/hwui/FontRenderer.cpp
parent4cd9612c3268277581589b34cc49ed04c93873b2 (diff)
parent895a43751fcf4f33e5437963d75d05c2cd754520 (diff)
am 895a4375: Merge "Fix FontRenderer bug." into klp-dev
* commit '895a43751fcf4f33e5437963d75d05c2cd754520': Fix FontRenderer bug.
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
-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 e8456afa310a..7e99a5fd44d2 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");
}