diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-13 09:33:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-13 09:33:12 +0000 |
| commit | eed1fba6b54b3305af811b4dd9e367eab01a241b (patch) | |
| tree | 2036c2cb12064f1247a5654217c7443a9d808820 /core/java/android/content | |
| parent | fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff (diff) | |
| parent | 11bce123b91cee70380bffa3fffa3c9d19ef3ebd (diff) | |
| download | frameworks_base-eed1fba6b54b3305af811b4dd9e367eab01a241b.zip frameworks_base-eed1fba6b54b3305af811b4dd9e367eab01a241b.tar.gz frameworks_base-eed1fba6b54b3305af811b4dd9e367eab01a241b.tar.bz2 | |
Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index e578822..ecae52c 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -666,6 +666,14 @@ public final class AssetManager implements AutoCloseable { /** * Get the locales that this asset manager contains data for. + * + * <p>On SDK 21 (Android 5.0: Lollipop) and above, Locale strings are valid + * <a href="https://tools.ietf.org/html/bcp47">BCP-47</a> language tags and can be + * parsed using {@link java.util.Locale#forLanguageTag(String)}. + * + * <p>On SDK 20 (Android 4.4W: Kitkat for watches) and below, locale strings + * are of the form {@code ll_CC} where {@code ll} is a two letter language code, + * and {@code CC} is a two letter country code. */ public native final String[] getLocales(); |