CDD: Require logging of some basic events available to app developers through statsd.
Enlist required fields to be more specific about what is
needed for developer tools and what is needed for privacy.
Bug: 76161779
Bug: 74125988
Test: None
Change-Id: I4ff9a73f72c3270caaac0f116297d666a58561fb
diff --git a/6_dev-tools-and-options/6_1_developer_tools.md b/6_dev-tools-and-options/6_1_developer_tools.md
index ff9a191..9b028e8 100644
--- a/6_dev-tools-and-options/6_1_developer_tools.md
+++ b/6_dev-tools-and-options/6_1_developer_tools.md
@@ -5,11 +5,41 @@
* [C-0-1] MUST support the Android Developer Tools provided in the Android
SDK.
* [**Android Debug Bridge (adb)**](http://developer.android.com/tools/help/adb.html)
- * [C-0-2] MUST support all adb functions as documented in the Android
- SDK including [dumpsys](https://source.android.com/devices/input/diagnostics.html).
+ * [C-0-2] MUST support adb as documented in the Android SDK and the shell
+ commands provided in the AOSP, which can be used by app developers,
+ including [`dumpsys`](https://source.android.com/devices/input/diagnostics.html)
+ and `cmd stats`.
* [C-0-3] MUST NOT alter the format or the contents of device system
- events (batterystats , diskstats, fingerprint, graphicsstats, netstats,
- notification, procstats) logged via dumpsys.
+ events (batterystats , diskstats, fingerprint, graphicsstats, netstats,
+ notification, procstats) logged via the dumpsys command.
+ * [C-0-10] MUST record, without ommmission, and make the following events
+ accessible and available to the `cmd stats` shell command and the
+ `StatsManager` System API class.
+ * ActivityForegroundStateChanged
+ * AnomalyDetected
+ * AppBreadcrumbReported
+ * AppCrashOccurred
+ * AppStartOccurred
+ * BatteryLevelChanged
+ * BatterySaverModeStateChanged
+ * BleScanResultReceived
+ * BleScanStateChanged
+ * ChargingStateChanged
+ * DeviceIdleModeStateChanged
+ * ForegroundServiceStateChanged
+ * GpsScanStateChanged
+ * JobStateChanged
+ * PluggedStateChanged
+ * ScheduledJobStateChanged
+ * ScreenStateChanged
+ * SyncStateChanged
+ * SystemElapsedRealtime
+ * UidProcessStateChanged
+ * WakelockStateChanged
+ * WakeupAlarmOccurred
+ * WifiLockStateChanged
+ * WifiMulticastLockStateChanged
+ * WifiScanStateChanged
* [C-0-4] MUST have the device-side adb daemon be inactive by default and
there MUST be a user-accessible mechanism to turn on the Android Debug
Bridge.
diff --git a/9_security-model/9_8_privacy.md b/9_security-model/9_8_privacy.md
index 8990a82..61a9b5f 100644
--- a/9_security-model/9_8_privacy.md
+++ b/9_security-model/9_8_privacy.md
@@ -8,11 +8,21 @@
Device implementations:
* [C-0-1] MUST keep a reasonable retention period of such user history.
-* [C-0-2] MUST only include the fields marked with `DEST_AUTOMATIC` in the
- incident report created by the System API class `IncidentManager`.
* [SR] Are STRONGLY RECOMMENDED to keep the 14 days retention period as
configured by default in the AOSP implementation.
+Android stores the system events using the [`StatsLog`](https://developer.android.com/reference/android/util/StatsLog.html)
+identifiers, and manages such history via the `StatsManager` and the
+`IncidentManager` System API.
+
+Device implementations:
+
+* [C-0-2] MUST only include the fields marked with `DEST_AUTOMATIC` in the
+ incident report created by the System API class `IncidentManager`.
+* [C-0-3] MUST not use the system event identifiers to log any other event
+ than what is described in the [`StatsLog`](https://developer.android.com/reference/android/util/StatsLog.html)
+ SDK documents. If additional system events are logged, they MAY use a
+ different atom identifier in the range between 100,000 and 200,000.
### 9.8.2\. Recording
