commit d7ece194c79e9a959c0ec8380e17c960a1a98c9c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 23 21:24:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 23 21:24:39 2017 +0000
tree 3a1717f2dd81dec6e2c8da2002aee6f54b794298
parent ff14143cee60a38b17c2610807a0503ba86d0bb2
parent dfe0647f6c7a80242f1646541a6f3460e0ef3c76

Merge "Fix unit test that failed due to incorrect refactor."

libs/hwui/tests/unit/RecordingCanvasTests.cpp

diff --git a/libs/hwui/tests/unit/RecordingCanvasTests.cpp b/libs/hwui/tests/unit/RecordingCanvasTests.cpp
index f48d98c..b2ea9ac 100644
--- a/libs/hwui/tests/unit/RecordingCanvasTests.cpp
+++ b/libs/hwui/tests/unit/RecordingCanvasTests.cpp
@@ -201,8 +201,16 @@
         for (int i = 0; i < 2; i++) {
             for (int j = 0; j < 2; j++) {
                 uint32_t flags = paint.getFlags();
-                if (i != 0) flags |= SkPaint::kUnderlineText_ReserveFlag;
-                if (j != 0) flags |= SkPaint::kStrikeThruText_ReserveFlag;
+                if (i != 0) {
+                    flags |= SkPaint::kUnderlineText_ReserveFlag;
+                } else {
+                    flags &= ~SkPaint::kUnderlineText_ReserveFlag;
+                }
+                if (j != 0) {
+                    flags |= SkPaint::kStrikeThruText_ReserveFlag;
+                } else {
+                    flags &= ~SkPaint::kStrikeThruText_ReserveFlag;
+                }
                 paint.setFlags(flags);
                 TestUtils::drawUtf8ToCanvas(&canvas, "test text", paint, 25, 25);
             }