From 4c6ce23816acdede6eb589cba07916a5340d0a38 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Fri, 18 Jul 2014 16:09:36 +0100 Subject: [PATCH] Remove copy of Locale.adjustLanguageCode. (cherry picked from commit 1d31a5f8243fd6befb14d8a2ba25d28e006511f8) Change-Id: I7b30a153a44dc1f99a9ddfe256b770d7305a74b7 --- core/java/android/content/res/Resources.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 38ddede2727aa..5face6977e635 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1824,15 +1824,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; } /**