summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2013-09-12 21:42:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-12 21:42:09 -0700
commite631c9ff2ea2838abf7bffb2332fbed3d35b85de (patch)
tree5989d8f0e4efeae45d755d7cbc764a8eb97665eb /core/java/android/text
parente68e06d0b9d45214c739451308b351e7365c4198 (diff)
parentdcb2c68fd145ab6812a49da30731d6cde2f16cd1 (diff)
downloadframeworks_base-e631c9ff2ea2838abf7bffb2332fbed3d35b85de.zip
frameworks_base-e631c9ff2ea2838abf7bffb2332fbed3d35b85de.tar.gz
frameworks_base-e631c9ff2ea2838abf7bffb2332fbed3d35b85de.tar.bz2
am dcb2c68f: am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev
* commit 'dcb2c68fd145ab6812a49da30731d6cde2f16cd1': 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];