summaryrefslogtreecommitdiffstats
path: root/libs/hwui
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-09-10 14:03:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-10 14:03:39 -0700
commitefb6beb4388e51a2e29ec605c500801f7ff150e6 (patch)
treecd53c2da91a43fed71e804258a5f37716f27d60a /libs/hwui
parent84166e888b8a639174f89a215103ba3929014c25 (diff)
parent19c727bbc6371924bfd2f85e804b5b6b093a8413 (diff)
downloadframeworks_base-efb6beb4388e51a2e29ec605c500801f7ff150e6.zip
frameworks_base-efb6beb4388e51a2e29ec605c500801f7ff150e6.tar.gz
frameworks_base-efb6beb4388e51a2e29ec605c500801f7ff150e6.tar.bz2
am 19c727bb: am 895a4375: Merge "Fix FontRenderer bug." into klp-dev
* commit '19c727bbc6371924bfd2f85e804b5b6b093a8413': Fix FontRenderer bug.
Diffstat (limited to 'libs/hwui')
-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 f44c7b9..054a376 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");
}