summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2015-03-17 19:22:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-17 19:22:46 +0000
commit97f3cd0a8280b2cf08069cc1e2d89d8bb227633f (patch)
tree50c7a6c8d511c40f054d73dcb0a45cb1100b8b1b /docs/html/guide
parent1f9a26af95abba385b612c734d1d5e32d9e3f363 (diff)
parentf4e73a94d8a39ed882e55c090f9e5ddbc22190fa (diff)
downloadframeworks_base-97f3cd0a8280b2cf08069cc1e2d89d8bb227633f.zip
frameworks_base-97f3cd0a8280b2cf08069cc1e2d89d8bb227633f.tar.gz
frameworks_base-97f3cd0a8280b2cf08069cc1e2d89d8bb227633f.tar.bz2
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/topics/manifest/application-element.jd6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd
index 8a0e837..b5af9c3 100644
--- a/docs/html/guide/topics/manifest/application-element.jd
+++ b/docs/html/guide/topics/manifest/application-element.jd
@@ -449,9 +449,13 @@ href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.<
<dt><a name="vmSafeMode"></a>{@code android:vmSafeMode}</dt>
<dd>Indicates whether the app would like the virtual machine (VM) to operate
in safe mode. The default value is {@code "false"}.
-</dd>
+<p> This attribute was added in API level 8 where a value of "true"
+disabled the Dalvik just-in-time (JIT) compiler. </p>
+<p> This attribute was adapted in API level 22 where a value of "true"
+disabled the ART ahead-of-time (AOT) compiler. </p>
+</dd>
</dl></dd>