summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-09-30 12:22:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-30 12:22:50 -0700
commit2effc77c9a49f983779dbab656bba490bb7d4ba0 (patch)
tree970cdd601bb4a2bed3d716d08b92982f108fd518 /core/java
parent0a5bc22273fc274a0d4bd9aa4bc80ee5116e11ef (diff)
parentfc4947491f785600b8770112fa1d19ece06d42f9 (diff)
downloadframeworks_base-2effc77c9a49f983779dbab656bba490bb7d4ba0.zip
frameworks_base-2effc77c9a49f983779dbab656bba490bb7d4ba0.tar.gz
frameworks_base-2effc77c9a49f983779dbab656bba490bb7d4ba0.tar.bz2
Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/Build.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 8860e0a..a7f39d5 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -413,7 +413,7 @@ public class Build {
public static final int JELLY_BEAN = 16;
/**
- * Moar jelly beans!
+ * Android 4.2: Moar jelly beans!
*
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
@@ -422,6 +422,12 @@ public class Build {
* {@code false}. See
* <a href="{@docRoot}guide/topics/manifest/provider-element.html#exported">
* the android:exported section</a> in the provider documentation for more details.</li>
+ * <li>{@link android.view.View#getLayoutDirection() View.getLayoutDirection()}
+ * can return different values than {@link android.view.View#LAYOUT_DIRECTION_LTR}
+ * based on the locale etc.
+ * <li> {@link android.webkit.WebView#addJavascriptInterface(Object, String)
+ * WebView.addJavascriptInterface} requires explicit annotations on methods
+ * for them to be accessible from Javascript.
* </ul>
*/
public static final int JELLY_BEAN_MR1 = 17;