Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev

2013-09-12 23:28:29 +00:00
parent 76ffaa5808 68669a42fb
commit 7558ec405f
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/text/AndroidBidi.java
+++ b/core/java/android/text/AndroidBidi.java
@@ -60,6 +60,9 @@ import android.text.Layout.Directions;
     */
    public static Directions directions(int dir, byte[] levels, int lstart,
            char[] chars, int cstart, int len) {
+        if (len == 0) {
+            return Layout.DIRS_ALL_LEFT_TO_RIGHT;
+        }

        int baseLevel = dir == Layout.DIR_LEFT_TO_RIGHT ? 0 : 1;
        int curLevel = levels[lstart];