Merge "Docs: Formula for headset spec"
diff --git a/src/devices/sensors/sensor-types.jd b/src/devices/sensors/sensor-types.jd
index add3796..f2bd4cb 100644
--- a/src/devices/sensors/sensor-types.jd
+++ b/src/devices/sensors/sensor-types.jd
@@ -396,7 +396,7 @@
<p>Reporting-mode: <em><a href="report-modes.html#one-shot">One-shot</a></em></p>
<p>Low-power</p>
<p>Implement only the wake-up version of this sensor.</p>
-<p><code>getDefaultSensor(SENSOR_TYPE_SIGNIFICANT_MOTION)</code> <em>returns a non-wake-up sensor</em></p>
+<p><code>getDefaultSensor(SENSOR_TYPE_SIGNIFICANT_MOTION)</code> <em>returns a wake-up sensor</em></p>
<p>A significant motion detector triggers when the detecting a “significant
motion”: a motion that might lead to a change in the user location.</p>
<p>Examples of such significant motions are:</p>
@@ -511,15 +511,13 @@
<code>sensors_event_t.data[0]</code>.</p>
<h2 id="attitude_composite_sensors">Attitude composite sensors</h2>
<h3 id="rotation_vector">Rotation vector</h3>
-<p>Underlying physical sensors: Accelerometer, Magnetometer, and (when present)
- Gyroscope</p>
+<p>Underlying physical sensors: Accelerometer, Magnetometer, and Gyroscope</p>
<p>Reporting-mode: <em><a href="report-modes.html#continuous">Continuous</a></em></p>
<p><code>getDefaultSensor(SENSOR_TYPE_ROTATION_VECTOR)</code> <em>returns a non-wake-up sensor</em></p>
<p>A rotation vector sensor reports the orientation of the device relative to the
East-North-Up coordinates frame. It is usually obtained by integration of
- accelerometer, gyroscope and magnetometer readings.</p>
-<p>The East-North-Up coordinate system is defined as a direct orthonormal basis
- where:</p>
+ accelerometer, gyroscope, and magnetometer readings. The East-North-Up
+ coordinate system is defined as a direct orthonormal basis where:</p>
<ul>
<li> X points east and is tangential to the ground. </li>
<li> Y points north and is tangential to the ground. </li>
@@ -531,9 +529,8 @@
coordinates (x,y,z).</p>
<p>The rotation can be seen as rotating the phone by an angle theta around an axis
rot_axis to go from the reference (East-North-Up aligned) device orientation to
- the current device orientation.</p>
-<p>The rotation is encoded as the four unit-less x, y, z, w components of a unit
- quaternion:</p>
+ the current device orientation. The rotation is encoded as the four unit-less
+ x, y, z, w components of a unit quaternion:</p>
<ul>
<li> <code>sensors_event_t.data[0] = rot_axis.x*sin(theta/2)</code> </li>
<li> <code>sensors_event_t.data[1] = rot_axis.y*sin(theta/2)</code> </li>
@@ -550,12 +547,11 @@
this will cause erratic client behaviour.</p>
<p>In addition, this sensor reports an estimated heading accuracy:</p>
<p><code>sensors_event_t.data[4] = estimated_accuracy</code> (in radians)</p>
-<p>The heading error must be less than <code>estimated_accuracy</code> 95% of the time. This
- sensor must use a gyroscope as main orientation change input unless there is no
- gyroscope on the device.</p>
-<p>This sensor also includes the accelerometer and magnetometer input to make up
- for gyroscope drift, but it cannot be implemented using only the magnetometer
- and accelerometer, unless there is no gyroscope on the device.</p>
+<p>The heading error must be less than <code>estimated_accuracy</code> 95% of
+the time. This sensor must use a gyroscope as the main orientation change input.</p>
+<p>This sensor also uses accelerometer and magnetometer input to make up
+ for gyroscope drift, and it cannot be implemented using only the accelerometer
+ and magnetometer.</p>
<h3 id="game_rotation_vector">Game rotation vector</h3>
<p>Underlying physical sensors: Accelerometer and Gyroscope (no Magnetometer)</p>
<p>Reporting-mode: <em><a href="report-modes.html#continuous">Continuous</a></em></p>
diff --git a/src/security/trusty/trusty-ref.jd b/src/security/trusty/trusty-ref.jd
index 69d4025..722af8f 100644
--- a/src/security/trusty/trusty-ref.jd
+++ b/src/security/trusty/trusty-ref.jd
@@ -153,7 +153,7 @@
IPC_HANDLE_POLL_READY = 0x1,
IPC_HANDLE_POLL_ERROR = 0x2,
IPC_HANDLE_POLL_HUP = 0x4,
- IPC_HANDLE_POLL_MSG jjjj= 0x8,
+ IPC_HANDLE_POLL_MSG = 0x8,
IPC_HANDLE_POLL_SEND_UNBLOCKED = 0x10,
… more values[TBD]
};
diff --git a/src/source/using-repo.jd b/src/source/using-repo.jd
index e1d1f0e..cb7845e 100644
--- a/src/source/using-repo.jd
+++ b/src/source/using-repo.jd
@@ -137,7 +137,7 @@
<pre><code>repo download <em><TARGET></em> <em><CHANGE></em>
</code></pre>
<p>Downloads the specified change from the review system and makes it available in your project's local working directory.</p>
-<p>For example, to download <a href="https://android-review.googlesource.com/23823">change 23823</a> into your platform/frameworks/base directory:</p>
+<p>For example, to download <a href="https://android-review.googlesource.com/23823">change 23823</a> into your platform/build directory:</p>
<pre><code>$ repo download platform/build 23823
</code></pre>
<p>A <code>repo sync</code> should effectively remove any commits retrieved via <code>repo download</code>. Or, you can check out the remote branch; e.g., <code>git checkout m/master</code>.</p>
