diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-05-20 13:41:07 +0900 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-05-20 13:41:07 +0900 |
| commit | f0c6ab843e7261755483d1c48e4c03f630cc79b5 (patch) | |
| tree | 03e5a0c4756a1dd52d02d51aa9f22dd2a83fb75f | |
| parent | 544fff54a9cbcdf58ca993eeefed86699157f820 (diff) | |
| download | frameworks_base-f0c6ab843e7261755483d1c48e4c03f630cc79b5.zip frameworks_base-f0c6ab843e7261755483d1c48e4c03f630cc79b5.tar.gz frameworks_base-f0c6ab843e7261755483d1c48e4c03f630cc79b5.tar.bz2 | |
Merge from donut.
| -rw-r--r-- | core/java/android/util/CharsetUtils.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/util/CharsetUtils.java b/core/java/android/util/CharsetUtils.java index 7553029..9d91aca 100644 --- a/core/java/android/util/CharsetUtils.java +++ b/core/java/android/util/CharsetUtils.java @@ -142,20 +142,25 @@ public final class CharsetUtils { /** * Returns whether the given character set name indicates the Shift-JIS - * encoding. + * encoding. Returns false if the name is null. * * @param charsetName the character set name * @return {@code true} if the name corresponds to Shift-JIS or * {@code false} if not */ private static boolean isShiftJis(String charsetName) { - if (charsetName.length() != 9) { - // Bail quickly if the length doesn't match. + // Bail quickly if the length doesn't match. + if (charsetName == null) { + return false; + } + int length = charsetName.length(); + if (length != 4 && length != 9) { return false; } return charsetName.equalsIgnoreCase("shift_jis") - || charsetName.equalsIgnoreCase("shift-jis"); + || charsetName.equalsIgnoreCase("shift-jis") + || charsetName.equalsIgnoreCase("sjis"); } /** |