Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c0fb18a2: Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev

Browse Source 
* commit 'c0fb18a215467be0f5bdc25fb6d5612349bc989b':
  Remove copy of Locale.adjustLanguageCode.
This commit is contained in:
Narayan Kamath
2014-07-23 12:51:22 +00:00
committed by Android Git Automerger
parent 4177112c34 c9e2716f7b
commit 6c0e4ebd62
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/res/Resources.java
View File

@@ -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;
}
/**