Merge "Docs: Editorial Fixes for Section 9.8 and 5.2.5 (video codec table)" into qt-dev
diff --git a/5_multimedia/5_2_video-encoding.md b/5_multimedia/5_2_video-encoding.md
index 8c825d2..ba96566 100644
--- a/5_multimedia/5_2_video-encoding.md
+++ b/5_multimedia/5_2_video-encoding.md
@@ -186,7 +186,6 @@
</tr>
<tr>
<th>Video bitrate</th>
- <td>600 Kbps </td>
<td>1.6 Mbps</td>
<td>4 Mbps</td>
<td>5 Mbps</td>
@@ -233,7 +232,6 @@
</tr>
<tr>
<th>Video bitrate</th>
- <td>600 Kbps </td>
<td>1.6 Mbps</td>
<td>4 Mbps</td>
<td>5 Mbps</td>
diff --git a/9_security-model/9_8_privacy.md b/9_security-model/9_8_privacy.md
index 304660b..814fb4c 100644
--- a/9_security-model/9_8_privacy.md
+++ b/9_security-model/9_8_privacy.md
@@ -40,11 +40,12 @@
* [C-0-3] MUST have an ongoing notification to the user while screen casting
or screen recording is enabled. AOSP meets this requirement by showing an
ongoing notification icon in the status bar.
+
If device implementations include functionality in the system that either
captures the contents displayed on the screen and/or records the audio stream
played on the device other than via the System API `ContentCaptureService`, or
other proprietary means described in
-[Section 9.8.5 Content Capture](#9_8_5_content_capture), they:
+[Section 9.8.6 Content Capture](#9_8_6_content_capture), they:
* [C-1-1] MUST have an ongoing notification to the user whenever this
functionality is enabled and actively capturing/recording.
@@ -72,6 +73,7 @@
* [C-0-1] MUST preinstall the same root certificates for the system-trusted
Certificate Authority (CA) store as [provided](https://source.android.com/security/overview/app-security.html#certificate-authorities)
+ in the upstream Android Open Source Project.
* [C-0-2] MUST ship with an empty user root CA store.
* [C-0-3] MUST display a warning to the user indicating the network traffic
may be monitored, when a user root CA is added.
