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

am acd4f7cf: am b5c714fc: am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."

Browse Source 
* commit 'acd4f7cf37487c55c6b15aa40f2da57b542dcebb':
  Remove copy of Locale.adjustLanguageCode.
This commit is contained in:
Narayan Kamath
2014-07-22 13:53:12 +00:00
committed by Android Git Automerger
parent abe3c8026b b0490cdefe
commit fbc5b48568
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;
}
/**