summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2013-09-12 21:36:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-12 21:36:57 -0700
commitdcb2c68fd145ab6812a49da30731d6cde2f16cd1 (patch)
tree755b9968cfb11fedd2c3645dfd95014cc729959d /core/java/android/text
parent2b274021f28e92cb7e32d6194f54cb5c374add93 (diff)
parent7558ec405f67b59afbf6089d13928cfdb2f950ff (diff)
downloadframeworks_base-dcb2c68fd145ab6812a49da30731d6cde2f16cd1.zip
frameworks_base-dcb2c68fd145ab6812a49da30731d6cde2f16cd1.tar.gz
frameworks_base-dcb2c68fd145ab6812a49da30731d6cde2f16cd1.tar.bz2
am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev
* commit '7558ec405f67b59afbf6089d13928cfdb2f950ff': Fix for AIOBE at android.text.AndroidBidi.directions
Diffstat (limited to 'core/java/android/text')
-rw-r--r--core/java/android/text/AndroidBidi.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java
index eacd40d..b1c07f5 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];