Merge "Docs: Adding clarification to cpu.active"
diff --git a/src/devices/accessories/headset/specification.jd b/src/devices/accessories/headset/specification.jd
index d1616b1..2a3435d 100644
--- a/src/devices/accessories/headset/specification.jd
+++ b/src/devices/accessories/headset/specification.jd
@@ -408,3 +408,21 @@
<td>Line In (high) > 5 Kohm</td>
</tr>
</table>
+
+ <table>
+ <tr>
+ <th style="width:40%">4-Segment Plug Detection Resistance (between 3rd and 4th segment)</th>
+ <th style="width:20%">Device Support</th>
+ <th style="width:40%">Notes</th>
+ </tr>
+ <tr>
+ <td>4-Segment Plug Threshold</td>
+ <td>Required</td>
+ <td>Resistance >= 100 ohms</td>
+ </tr>
+ <tr>
+ <td>3-Segment Plug Threshold</td>
+ <td>Required</td>
+ <td>Resistance < 100 ohms</td>
+ </tr>
+</table>
diff --git a/src/devices/sensors/images/ape_fwk_sensors.png b/src/devices/sensors/images/ape_fwk_sensors.png
index fcd240a..6cb6b1b 100644
--- a/src/devices/sensors/images/ape_fwk_sensors.png
+++ b/src/devices/sensors/images/ape_fwk_sensors.png
Binary files differ
diff --git a/src/security/encryption/index.jd b/src/security/encryption/index.jd
index f7bcc3b..0cad3ec 100644
--- a/src/security/encryption/index.jd
+++ b/src/security/encryption/index.jd
@@ -86,7 +86,9 @@
<p>When the user sets the PIN/pass or password on the device, only the 128-bit key
is re-encrypted and stored. (ie. user PIN/pass/pattern changes do NOT cause
-re-encryption of userdata.) </p>
+re-encryption of userdata.) Note that
+<a href="http://developer.android.com/guide/topics/admin/device-admin.html">managed device</a>
+may be subject to PIN, pattern, or password restrictions.</p>
<p>Encryption is managed by <code>init</code> and <code>vold</code>. <code>init</code> calls <code>vold</code>, and vold sets properties to trigger events in init. Other parts of the system
also look at the properties to conduct tasks such as report status, ask for a
diff --git a/src/source/community.jd b/src/source/community.jd
index ea92fb7..8669c8e 100644
--- a/src/source/community.jd
+++ b/src/source/community.jd
@@ -1,6 +1,22 @@
page.title=Android Community
@jd:body
+<!--
+ Copyright 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<div id="qv-wrapper">
<div id="qv">
<h2>In this document</h2>
@@ -10,18 +26,99 @@
</div>
<p>Welcome to the Android community!</p>
+
<p>The key to any community is communication. Like most projects, Android
communicates via mailing lists. Because Android is an extremely large
project with many components, we have many discussion forums, each focusing on
-a different topic.</p>
-<p>Check out the groups below and join any that seem interesting to
-you. Note that if you're a user looking for help with your Android device,
-this page probably isn't for you; you should contact your carrier or retailer
-for help with your phone.</p>
-<p>If you're looking for information about building applications for Android,
-you can find a separate set of groups at our sister site
-<a href="https://developer.android.com/resources/community-groups.html">
-developer.android.com</a>.</p>
+a different topic. View the available <a href="#open-source-project-discussions">groups</a>
+and join any that seem interesting to you. You can also discuss Android on
+<a href="#android-on-irc">IRC</a>.</p>
+
+<p>If you are a user looking for help with the Android UI or an Android device,
+details on Android updates or security issues, or how to build applications for
+Android, see the list of <a href="#resources">resources</a> below.</p>
+
+<h2 id="resources">Resources</h2>
+
+<p>This site covers creating custom Android stacks, porting devices and
+accessories, and meeting compatibility requirements. For other information about
+Android, refer to the following resources.</p>
+
+<div class="wrap">
+<div class="col-4">
+
+<h4>Using Android</h4>
+
+<h5>Help centers</h5>
+<a href="https://support.google.com/android/?hl=en">General</a><br>
+<a href="https://support.google.com/nexus/?hl=en#topic=3415518">Nexus Phones/Tablets</a><br>
+<a href="https://support.google.com/playedition#topic=3450794">Google Play Edition</a><br>
+<a href="https://support.google.com/androidauto/?hl=en">Auto</a><br>
+<a href="https://support.google.com/androidtv/?hl=en#topic=6121147">TV</a><br>
+<a href="https://support.google.com/androidwear/?hl=en#topic=6056405">Wear</a><br>
+<a href="https://support.google.com/android/answer/3123680">Apps</a>
+<p></p>
+
+<h5>Communities</h5>
+<a href="http://source.android.com/source/community.html">AOSP communities</a><br>
+<a href="http://developer.android.com/support.html">Developer communities</a>
+<p></p>
+
+<h5>Send feedback</h5>
+<a href="http://source.android.com/source/report-bugs.html">Report AOSP bug</a><br>
+<a href="https://code.google.com/p/android/issues/entry?template=Feature%20request">Suggest
+a feature</a>
+<p></p>
+
+</div>
+<div class="col-4">
+
+
+<h4>Updates & security</h4>
+
+<h5>Android releases</h5>
+<a href="https://www.android.com/history/#/marshmallow">Android History</a><br>
+<a href="https://www.android.com/versions/marshmallow-6-0/">Current Release</a>
+<p></p>
+
+<h5>Device images</h5>
+<a href="https://developers.google.com/android/nexus/images?hl=en">Nexus devices</a><br>
+<a href="https://support.google.com/android/answer/3094742">Other devices</a>
+<p></p>
+
+<h5>Security assistance</h5>
+<a href="https://www.google.com/safetycenter/everyone/start/">Google Safety Center</a><br>
+<a href="https://support.google.com/android/answer/6215472?hl=en">Tips for users</a><br>
+<a href="http://developer.android.com/training/articles/security-tips.html">Tips
+for developers</a><br>
+<a href="http://source.android.com/security/index.html">Platform security</a>
+<p></p>
+
+<h5>Security announcements</h5>
+<a href="https://source.android.com/security/enhancements/index.html">Release
+Enhancements</a><br>
+<a href="https://groups.google.com/forum/#!forum/android-security-updates">Bulletins</a>
+<p></p>
+
+</div>
+<div class="col-4">
+
+<h4>Getting involved</h4>
+
+<h5>Developer resources</h5>
+<a href="http://developer.android.com/">Developer.android.com</a><br>
+<a href="http://developer.android.com/support.html">Developer support</a><br>
+<a href="http://android-developers.blogspot.com/">Android developers blog</a>
+<p></p>
+
+<h5>Training</h5>
+<a href="https://developer.android.com/training/index.html">Google</a><br>
+<a href="https://www.udacity.com/google">Udacity</a>
+
+</div>
+</div>
+<div style="clear: both;"></div>
+
<h2 id="open-source-project-discussions">Open Source Project discussions</h2>
<ul>
@@ -258,4 +355,4 @@
<p><a href="irc://irc.freenode.net/android-root">#android-root</a> - for
discussion related to off-label uses of hardware</p>
</li>
-</ul>
+</ul>
\ No newline at end of file
