diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-12 13:00:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 13:00:25 -0700 |
| commit | 23ef5fcff4d99ce05ace9fd43dd0c1ace9489579 (patch) | |
| tree | b450a2fc2e3ec616481340230e6bd8d52baecc7b /core/java/android/view/View.java | |
| parent | 0f9e241a249eaccded346113aaaa0c2e7de8ae1b (diff) | |
| parent | 5d15f40a19be01fa9c5a9674b31b6b18774cbeac (diff) | |
am 5d15f40a: am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev
* commit '5d15f40a19be01fa9c5a9674b31b6b18774cbeac':
NPE when iterating by character and word in Launcher widgets.
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e680d41ec44a..672ff02c891f 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6946,7 +6946,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, CharSequence text = getIterableTextForAccessibility(); if (text != null && text.length() > 0) { CharacterTextSegmentIterator iterator = - CharacterTextSegmentIterator.getInstance(mContext); + CharacterTextSegmentIterator.getInstance( + mContext.getResources().getConfiguration().locale); iterator.initialize(text.toString()); return iterator; } @@ -6955,7 +6956,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, CharSequence text = getIterableTextForAccessibility(); if (text != null && text.length() > 0) { WordTextSegmentIterator iterator = - WordTextSegmentIterator.getInstance(mContext); + WordTextSegmentIterator.getInstance( + mContext.getResources().getConfiguration().locale); iterator.initialize(text.toString()); return iterator; } |