Merge "CDD: Add Data Deletion section" into mnc-dev
diff --git a/src/compatibility/android-cdd.html b/src/compatibility/android-cdd.html
index f6babd3..0dc9581 100644
--- a/src/compatibility/android-cdd.html
+++ b/src/compatibility/android-cdd.html
@@ -281,7 +281,7 @@
<p class="toc_h2"><a href="#8_1_user_experience_consistency">8.1. User Experience Consistency</a></p>
-<p class="toc_h2"><a href="#8_2_memory_performance">8.2. Memory Performance</a></p>
+<p class="toc_h2"><a href="#8_2_file_i_o_access_performance">8.2. File I/O Access Performance</a></p>
</div>
@@ -670,7 +670,7 @@
<tr>
<td>FINGERPRINT</td>
<td>A string that uniquely identifies this build. It SHOULD be reasonably
-human-readable. It MUST follow this template:</p>
+human-readable. It MUST follow this template:
<p class="small">$(BRAND)/$(PRODUCT)/<br>
$(DEVICE):$(VERSION.RELEASE)/$(ID)/$(VERSION.INCREMENTAL):$(TYPE)/$(TAGS)</p>
<p>For example:</p>
@@ -680,7 +680,7 @@
included in the template above have whitespace characters, they MUST be
replaced in the build fingerprint with another character, such as the
underscore ("_") character. The value of this field MUST be encodable as 7-bit
-ASCII.</td>
+ASCII.</p></td>
</tr>
<tr>
<td>HARDWARE</td>
@@ -1663,7 +1663,7 @@
<li>Ensure the default dialer can look up caller information from the managed
profile (if one exists) alongside those from the primary profile</li>
<li>Ensure that all the security requirements for multi user (see
-<a href="#9_5_multi-user_support">section 9.5<a/>) apply to
+<a href="#9_5_multi-user_support">section 9.5</a>) apply to
managed profiles.</li>
</ul>
@@ -1789,9 +1789,9 @@
<th>Supported File Types/Container Formats</th>
</tr>
<tr>
- <td>MPEG-4 AAC Profile</p>
+ <td>MPEG-4 AAC Profile<br />
-<p>(AAC LC)</td>
+(AAC LC)</td>
<td>REQUIRED<sup>1</sup></td>
<td>REQUIRED</td>
<td>Support for mono/stereo/5.0/5.1<sup>2</sup> content with standard sampling rates from 8 to
@@ -1813,9 +1813,9 @@
<td></td>
</tr>
<tr>
- <td>MPEG-4 HE AACv2</p>
+ <td>MPEG-4 HE AACv2<br />
-<p>Profile (enhanced AAC+)</td>
+Profile (enhanced AAC+)</td>
<td> </td>
<td>REQUIRED</td>
<td>Support for mono/stereo/5.0/5.1<sup>2</sup> content with standard sampling rates from 16
@@ -1824,12 +1824,12 @@
</tr>
<tr>
<td>AAC ELD (enhanced low delay AAC)</td>
- <td>REQUIRED<sup>1</sup> </p>
+ <td>REQUIRED<sup>1</sup> <br />
-<p>(Android 4.1+)</td>
- <td>REQUIRED</p>
+(Android 4.1+)</td>
+ <td>REQUIRED<br />
-<p>(Android 4.1+)</td>
+(Android 4.1+)</td>
<td>Support for mono/stereo content with standard sampling rates from 16 to 48 kHz.</td>
<td></td>
</tr>
@@ -2015,12 +2015,12 @@
</tr>
<tr>
<td>VP8<sup>3</sup></td>
- <td>REQUIRED<sup>2</sup></p>
+ <td>REQUIRED<sup>2</sup><br />
-<p>(Android 4.3+)</td>
- <td>REQUIRED<sup>2</sup></p>
+(Android 4.3+)</td>
+ <td>REQUIRED<sup>2</sup><br />
-<p>(Android 2.3.3+)</td>
+(Android 2.3.3+)</td>
<td>See <a href="#5_2_video_encoding">section 5.2</a> and <a href="#5_3_video_decoding">5.3</a> for details</td>
<td><ul>
<li class="table_list">WebM (.webm) [<a href="http://www.webmproject.org/">Resources, 110</a></li>
@@ -2291,9 +2291,9 @@
<th></th>
<th>SD (Low quality)</th>
<th>SD (High quality)</th>
- <th>HD 720p<sup>1</sup></td>
- <th>HD 1080p<sup>1</sup></td>
- <th>UHD<sup>2</sup></td>
+ <th>HD 720p<sup>1</sup></th>
+ <th>HD 1080p<sup>1</sup></th>
+ <th>UHD<sup>2</sup></th>
</tr>
<tr>
<th>Video resolution</th>
@@ -3202,7 +3202,7 @@
<table>
<tr>
<th>Button</th>
- <th>HID Usage</strong><sup>2</sup></td>
+ <th>HID Usage<sup>2</sup></th>
<th>Android Button</th>
</tr>
<tr>
@@ -3226,16 +3226,16 @@
<td>KEYCODE_BUTTON_Y (100)</td>
</tr>
<tr>
- <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_UP">D-pad up</a><sup>1</sup></p>
+ <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_UP">D-pad up</a><sup>1</sup><br />
-<p><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_DOWN">D-pad down</a><sup>1</sup></td>
+<a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_DOWN">D-pad down</a><sup>1</sup></td>
<td>0x01 0x0039<sup>3</sup></td>
<td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_HAT_Y">AXIS_HAT_Y</a><sup>4</sup></td>
</tr>
<tr>
- <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_LEFT">D-pad left</a>1</p>
+ <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_LEFT">D-pad left</a>1<br />
-<p><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_RIGHT">D-pad right</a><sup>1</sup></td>
+<a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_RIGHT">D-pad right</a><sup>1</sup></td>
<td>0x01 0x0039<sup>3</sup></td>
<td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_HAT_X">AXIS_HAT_X</a><sup>4</sup></td>
</tr>
@@ -3287,7 +3287,7 @@
<table>
<tr>
- <th>Analog Controls</strong><sup>1</sup></td>
+ <th>Analog Controls<sup>1</sup></th>
<th>HID Usage</th>
<th>Android Button</th>
</tr>
@@ -3303,21 +3303,21 @@
</tr>
<tr>
<td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_Y">Left Joystick</a></td>
- <td>0x01 0x0030</p>
+ <td>0x01 0x0030<br />
-<p>0x01 0x0031</td>
- <td>AXIS_X</p>
+0x01 0x0031</td>
+ <td>AXIS_X<br />
-<p>AXIS_Y</td>
+AXIS_Y</td>
</tr>
<tr>
<td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_Z">Right Joystick</a></td>
- <td>0x01 0x0032</p>
+ <td>0x01 0x0032<br />
-<p>0x01 0x0035</td>
- <td>AXIS_Z</p>
+0x01 0x0035</td>
+ <td>AXIS_Z<br />
-<p>AXIS_RZ</td>
+AXIS_RZ</td>
</tr>
</table>
@@ -3860,7 +3860,7 @@
<li>NFC Forum Tag Types 1, 2, 3, 4 (defined by the NFC Forum)</li>
</ul>
<li>MUST be capable of reading and writing NDEF messages as well as raw
- data via the following NFC standards:</li>
+ data via the following NFC standards:
<ul>
<li>NfcV (ISO 15693)</li>
</ul></li>
@@ -4933,7 +4933,7 @@
<h1 id="12_document_changelog">12. Document Changelog</h1>
<p>The following table contains a summary of the changes to the Compatibility
-Definition in this release. </p>
+Definition in this release.</p>
<table>
<tr>
<th>Section</th>
@@ -4956,6 +4956,10 @@
<td>Change for the user agent string reported by the WebView</td>
</tr>
<tr>
+ <td>3.7. Runtime Compatibility</td>
+ <td>Updates to memory allocation table</td>
+ </tr>
+ <tr>
<td>3.8.6. Themes</td>
<td>Added requirement to support black system icons when requested by the SYSTEM_UI_FLAG_LIGHT_STATUS_BAR flag</td>
</tr>
@@ -4988,7 +4992,7 @@
<td>General updates for professional audio support; updates for mobile device (jack) specifications, USB audio host mode, and other updates</td>
</tr>
<tr>
- <td>5.9 Musical Instrument Digital Interface (MIDI)</td>
+ <td>5.9. Musical Instrument Digital Interface (MIDI)</td>
<td>Added new section on optional Musical Instrument Digital Interface (MIDI) support</td>
</tr>
<tr>
@@ -4996,6 +5000,22 @@
<td>Update for drivers supporting Windows 10</td>
</tr>
<tr>
+ <td>7.1.1.3. Screen Density</td>
+ <td>Updates for screen density, for example related to an Android watch</td>
+ </tr>
+ <tr>
+ <td>7.3. Sensors (and subsections)</td>
+ <td>New requirements for some sensor types</td>
+ </tr>
+ <tr>
+ <td>7.3.9. High Fidelity Sensors</td>
+ <td>New section with requirements for devices supporting high fidelity sensors</td>
+ </tr>
+ <tr>
+ <td>7.3.10. Fingerprint Sensor</td>
+ <td>New section on requirements related to fingerprint sensors</td>
+ </tr>
+ <tr>
<td>7.4.3. Bluetooth</td>
<td>Addition related to Resolvable Private Address (RPA) for Bluetooth Low Energy (BLE)</td>
</tr>
@@ -5012,10 +5032,14 @@
<td>Additions related to near-ultrasound recording, playback, and audio</td>
</tr>
<tr>
- <td>9.1 Permissions</td>
+ <td>9.1. Permissions</td>
<td>Addition to Permissions requirements</td>
</tr>
<tr>
+ <td>9.7. Kernel Security Features</td>
+ <td>SE Linux updates</td>
+ </tr>
+<tr>
<td>9.8. Privacy</td>
<td>Addition regarding user's consent for access to shared storage over a USB port</td>
</tr>
@@ -5028,6 +5052,10 @@
<td>Additional requirement for verified boot</td>
</tr>
<tr>
+ <td>9.11. Keys and Credentials</td>
+ <td>New section of requirements related to keys and credentials</td>
+ </tr>
+ <tr>
<td>11. Updatable Software</td>
<td>Requirement related to the system update policy set by the device owner</td>
</tr>
