diff options
| author | Narayan Kamath <narayan@google.com> | 2014-07-22 11:15:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-17 22:36:58 +0000 |
| commit | e242111c5dc63e1cbba41d2341b493cb9c064589 (patch) | |
| tree | 107c0dfb871131d39b5a4ab76d4e2e873cdffc1e | |
| parent | 02fd104f303cb7d55d6af42be8fe7be543e9aba5 (diff) | |
| parent | 1d31a5f8243fd6befb14d8a2ba25d28e006511f8 (diff) | |
| download | base-e242111c5dc63e1cbba41d2341b493cb9c064589.tar.gz | |
Merge "Remove copy of Locale.adjustLanguageCode."
| -rw-r--r-- | core/java/android/content/res/Resources.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 3db9ddb673aa..9a67dc58f6f7 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1680,15 +1680,7 @@ public class Resources { remainder = languageTag.substring(separator); } - if ("id".equals(language)) { - return "in" + remainder; - } else if ("yi".equals(language)) { - return "ji" + remainder; - } else if ("he".equals(language)) { - return "iw" + remainder; - } else { - return languageTag; - } + return Locale.adjustLanguageCode(language) + remainder; } /** |