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

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

Browse Source 
* commit 'b5c714fca79028116db0b00157dc09616efeaa95':
  Remove copy of Locale.adjustLanguageCode.
This commit is contained in:
Narayan Kamath
2014-07-22 13:49:36 +00:00
committed by Android Git Automerger
parent 6cc2fb2df2 b5c714fca7
commit b0490cdefe
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;
}
/**