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

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java
index eacd40d0db29..b1c07f592c79 100644
--- 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];