Improve MediaProvider WW atoms
Rename MediaProvider atoms to past tense verbs.
Slightly redefine the atoms for MediaProvider event metrics.
The changes are:
1. Remove timestamps from all atoms (because WW already attaches
timestamps to its events).
2. Log UIDs instead of package names.
Test: build
Bug: 149669087
Change-Id: I6bfb1da7e645f86d1b4a850f68614bc8fe105568
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index bd15264..1bb8954 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -384,12 +384,12 @@
PerfettoUploaded perfetto_uploaded = 229 [(module) = "perfetto"];
VmsClientConnectionStateChanged vms_client_connection_state_changed =
230 [(module) = "car"];
- MediaProviderScanEvent media_provider_scan_event = 233 [(module) = "mediaprovider"];
- MediaProviderDeletionEvent media_provider_deletion_event = 234 [(module) = "mediaprovider"];
- MediaProviderPermissionEvent media_provider_permission_event =
+ MediaProviderScanOccurred media_provider_scan_occurred = 233 [(module) = "mediaprovider"];
+ MediaContentDeleted media_content_deleted = 234 [(module) = "mediaprovider"];
+ MediaProviderPermissionRequested media_provider_permission_requested =
235 [(module) = "mediaprovider"];
- MediaProviderSchemaChange media_provider_schema_change = 236 [(module) = "mediaprovider"];
- MediaProviderIdleMaintenance media_provider_idle_maintenance =
+ MediaProviderSchemaChanged media_provider_schema_changed = 236 [(module) = "mediaprovider"];
+ MediaProviderIdleMaintenanceFinished media_provider_idle_maintenance_finished =
237 [(module) = "mediaprovider"];
RebootEscrowRecoveryReported reboot_escrow_recovery_reported = 238 [(module) = "framework"];
BootTimeEventDuration boot_time_event_duration_reported = 239 [(module) = "framework"];
@@ -4370,7 +4370,7 @@
* Logged from:
* packages/providers/MediaProvider/src/com/android/providers/media/scan/ModernMediaScanner.java
*/
-message MediaProviderScanEvent {
+message MediaProviderScanOccurred {
enum Reason {
// Scan triggered due to unknown reason
UNKNOWN = 0;
@@ -4404,15 +4404,13 @@
* Logged from:
* packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java
*/
-message MediaProviderDeletionEvent {
+message MediaContentDeleted {
// Volume type that this event pertains to
optional android.stats.mediaprovider.VolumeType volume_type = 1;
- // Device timestamp when this deletion event occurred
- optional int64 timestamp_millis = 2;
- // App that requested deletion
- optional string package_name = 3;
+ // UID of app that requested deletion
+ optional int32 uid = 2 [(is_uid) = true];
// Number of items that were deleted
- optional int32 item_count = 4;
+ optional int32 item_count = 3;
}
/**
@@ -4421,7 +4419,7 @@
* Logged from:
* packages/providers/MediaProvider/src/com/android/providers/media/PermissionActivity.java
*/
-message MediaProviderPermissionEvent {
+message MediaProviderPermissionRequested {
enum Result {
UNKNOWN = 0;
USER_GRANTED = 1;
@@ -4433,14 +4431,12 @@
// Volume type that this event pertains to
optional android.stats.mediaprovider.VolumeType volume_type = 1;
- // Device timestamp when this permission event occurred
- optional int64 timestamp_millis = 2;
- // App that requested permission
- optional string package_name = 3;
+ // UID of app that requested permission
+ optional int32 uid = 2 [(is_uid) = true];
// Number of items that were requested
- optional int32 item_count = 4;
+ optional int32 item_count = 3;
// Result of this request
- optional Result result = 5;
+ optional Result result = 4;
}
/**
@@ -4449,7 +4445,7 @@
* Logged from:
* packages/providers/MediaProvider/src/com/android/providers/media/DatabaseHelper.java
*/
-message MediaProviderSchemaChange {
+message MediaProviderSchemaChanged {
// Volume type that this event pertains to
optional android.stats.mediaprovider.VolumeType volume_type = 1;
// Old database version code
@@ -4468,7 +4464,7 @@
* Logged from:
* packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java
*/
-message MediaProviderIdleMaintenance {
+message MediaProviderIdleMaintenanceFinished {
// Volume type that this event pertains to
optional android.stats.mediaprovider.VolumeType volume_type = 1;