commit 50b6c6a7ee306e9ddadefe833e5859e6cec98e24
author Ruben Brunk <rubenbrunk@google.com> Tue Jun 17 00:27:25 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 16 21:55:25 2014 +0000
tree e7fc8bdfcc73f60a721a534f71cbb3ec05841681
parent f0c04e59ff8182c8a342d89a747072bc51cc0cac
parent 3a640fe48dcb1a10aa1bce54b7eecaa524004948

Merge "cts: Assertion fix for camera characteristics tests."

tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java

diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
index b249b9e..b754a12 100644
--- a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
@@ -48,7 +48,7 @@
 
         @Override
         public float getTextRunAdvances(char[] chars, int index, int count,
-                int contextIndex, int contextCount, int flags, float[] advances,
+                int contextIndex, int contextCount, boolean isRtl, float[] advances,
                 int advancesIndex) {
 
             // Conditions copy pasted from Paint
@@ -56,10 +56,6 @@
                 throw new IllegalArgumentException("text cannot be null");
             }
 
-            if (flags != DIRECTION_LTR && flags != DIRECTION_RTL) {
-                throw new IllegalArgumentException("unknown flags value: " + flags);
-            }
-
             if ((index | count | contextIndex | contextCount | advancesIndex
                     | (index - contextIndex) | (contextCount - count)
                     | ((contextIndex + contextCount) - (index + count))