From: Andy McFadden <fadden@android.com>
Date: Wed, 15 Sep 2010 18:22:26 +0000 (-0700)
Subject: Update docs for removal of dalvik.vm.deadlock-predict.
X-Git-Tag: android-x86-4.0-r1~298^2~34^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=802ffdfc1adefaa18dd4156a2b9d7401b6dc58e9;p=android-x86%2Fdalvik.git

Update docs for removal of dalvik.vm.deadlock-predict.

I don't think any external developers have used this, so there's not
much risk of breaking a script.  The feature itself still exists, but
now you have to use the more general dalvik.vm.extra-opts property
to enable it.

Bug 2844083

Change-Id: Id4e1d8466e9b9e5818331ab1f40429040c49437b
---

diff --git a/docs/embedded-vm-control.html b/docs/embedded-vm-control.html
index ec2b69462..11751e075 100644
--- a/docs/embedded-vm-control.html
+++ b/docs/embedded-vm-control.html
@@ -219,8 +219,7 @@ monitor locks are acquired.  If the program attempts to acquire a set
 of locks in a different order from what was seen earlier, the VM logs
 a warning and optionally throws an exception.
 
-<p>The command-line argument is set based on the
-<code>dalvik.vm.deadlock-predict</code> property.  Valid values are
+<p>Valid values for the command-line argument are
 <code>off</code> to disable it (default), <code>warn</code> to log the
 problem but continue executing, <code>err</code> to cause a
 <code>dalvik.system.PotentialDeadlockError</code> to be thrown from the
@@ -228,7 +227,7 @@ problem but continue executing, <code>err</code> to cause a
 the entire VM abort.
 
 <p>You will usually want to use:
-<pre>adb shell setprop dalvik.vm.deadlock-predict err</pre>
+<pre>adb shell setprop dalvik.vm.extra-opts -Xdeadlockpredict:err</pre>
 unless you are keeping an eye on the logs as they scroll by.
 
 <p>Please note that this feature is deadlock prediction, not deadlock
@@ -291,7 +290,7 @@ to check for corruption in a large set of files.
 
 <h2><a name="general">General Flags</a></h2>
 
-<p>In the "Honeycomb" release, a general mechanism for passing flags to
+<p>In the "Gingerbread" release, a general mechanism for passing flags to
 the VM was introduced:
 
 <pre>adb shell setprop dalvik.vm.extra-opts "flag1 flag2 ... flagN"</pre>