Merge "base: make base::Optional a shim for std::optional"
diff --git a/protos/perfetto/config/perfetto_config.proto b/protos/perfetto/config/perfetto_config.proto
index 3673dd0..03f9d8a 100644
--- a/protos/perfetto/config/perfetto_config.proto
+++ b/protos/perfetto/config/perfetto_config.proto
@@ -1550,7 +1550,6 @@
WTF_OCCURRED = 80;
LOW_MEM_REPORTED = 81;
GENERIC_ATOM = 82;
- KEY_VALUE_PAIRS_ATOM = 83;
VIBRATOR_STATE_CHANGED = 84;
DEFERRED_JOB_STATS_REPORTED = 85;
THERMAL_THROTTLING = 86;
@@ -1799,6 +1798,7 @@
ART_DATUM_REPORTED = 332;
DEVICE_ROTATED = 333;
SIM_SPECIFIC_SETTINGS_RESTORED = 334;
+ TEXT_CLASSIFIER_DOWNLOAD_REPORTED = 335;
PIN_STORAGE_EVENT = 336;
FACE_DOWN_REPORTED = 337;
BLUETOOTH_HAL_CRASH_REASON_REPORTED = 338;
@@ -1843,9 +1843,12 @@
PRIVACY_SENSOR_TOGGLE_INTERACTION = 381;
PRIVACY_TOGGLE_DIALOG_INTERACTION = 382;
APP_SEARCH_OPTIMIZE_STATS_REPORTED = 383;
+ NON_A11Y_TOOL_SERVICE_WARNING_REPORT = 384;
+ APP_SEARCH_SET_SCHEMA_STATS_REPORTED = 385;
APP_COMPAT_STATE_CHANGED = 386;
SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED = 387;
SPLITSCREEN_UI_CHANGED = 388;
+ NETWORK_DNS_HANDSHAKE_REPORTED = 389;
BLUETOOTH_CODE_PATH_COUNTER = 390;
BLUETOOTH_LE_BATCH_SCAN_REPORT_DELAY = 392;
ACCESSIBILITY_FLOATING_MENU_UI_CHANGED = 393;
@@ -1853,21 +1856,122 @@
NEURALNETWORKS_EXECUTION_COMPLETED = 395;
NEURALNETWORKS_COMPILATION_FAILED = 396;
NEURALNETWORKS_EXECUTION_FAILED = 397;
+ CONTEXT_HUB_BOOTED = 398;
+ CONTEXT_HUB_RESTARTED = 399;
+ CONTEXT_HUB_LOADED_NANOAPP_SNAPSHOT_REPORTED = 400;
+ CHRE_CODE_DOWNLOAD_TRANSACTED = 401;
+ UWB_SESSION_INITED = 402;
+ UWB_SESSION_CLOSED = 403;
+ UWB_FIRST_RANGING_RECEIVED = 404;
+ UWB_RANGING_MEASUREMENT_RECEIVED = 405;
+ TEXT_CLASSIFIER_DOWNLOAD_WORK_SCHEDULED = 406;
+ TEXT_CLASSIFIER_DOWNLOAD_WORK_COMPLETED = 407;
+ CLIPBOARD_CLEARED = 408;
VM_CREATION_REQUESTED = 409;
+ NEARBY_DEVICE_SCAN_STATE_CHANGED = 410;
CAMERA_COMPAT_CONTROL_EVENT_REPORTED = 411;
- TRACING_SERVICE_REPORT_EVENT = 424;
+ APPLICATION_LOCALES_CHANGED = 412;
+ MEDIAMETRICS_AUDIOTRACKSTATUS_REPORTED = 413;
+ FOLD_STATE_DURATION_REPORTED = 414;
+ LOCATION_TIME_ZONE_PROVIDER_CONTROLLER_STATE_CHANGED = 415;
+ DISPLAY_HBM_STATE_CHANGED = 416;
+ DISPLAY_HBM_BRIGHTNESS_CHANGED = 417;
+ PERSISTENT_URI_PERMISSIONS_FLUSHED = 418;
EARLY_BOOT_COMP_OS_ARTIFACTS_CHECK_REPORTED = 419;
- ISOLATED_COMPILATION_SCHEDULED = 457;
- ISOLATED_COMPILATION_ENDED = 458;
- TELEPHONY_ANOMALY_DETECTED = 461;
+ VBMETA_DIGEST_REPORTED = 420;
+ APEX_INFO_GATHERED = 421;
+ PVM_INFO_GATHERED = 422;
+ WEAR_SETTINGS_UI_INTERACTED = 423;
+ TRACING_SERVICE_REPORT_EVENT = 424;
+ MEDIAMETRICS_AUDIORECORDSTATUS_REPORTED = 425;
+ LAUNCHER_LATENCY = 426;
+ DROPBOX_ENTRY_DROPPED = 427;
+ WIFI_P2P_CONNECTION_REPORTED = 428;
+ GAME_STATE_CHANGED = 429;
HOTWORD_DETECTOR_CREATE_REQUESTED = 430;
HOTWORD_DETECTION_SERVICE_INIT_RESULT_REPORTED = 431;
HOTWORD_DETECTION_SERVICE_RESTARTED = 432;
HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED = 433;
HOTWORD_DETECTOR_EVENTS = 434;
+ BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED = 437;
+ CONTACTS_INDEXER_UPDATE_STATS_REPORTED = 440;
+ APP_BACKGROUND_RESTRICTIONS_INFO = 441;
+ MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED = 442;
+ MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED = 443;
+ PERMISSION_REMINDER_NOTIFICATION_INTERACTED = 444;
+ RECENT_PERMISSION_DECISIONS_INTERACTED = 445;
+ GNSS_PSDS_DOWNLOAD_REPORTED = 446;
+ LE_AUDIO_CONNECTION_SESSION_REPORTED = 447;
+ LE_AUDIO_BROADCAST_SESSION_REPORTED = 448;
+ DREAM_UI_EVENT_REPORTED = 449;
+ TASK_MANAGER_EVENT_REPORTED = 450;
+ CDM_ASSOCIATION_ACTION = 451;
+ MAGNIFICATION_TRIPLE_TAP_AND_HOLD_ACTIVATED_SESSION_REPORTED = 452;
+ MAGNIFICATION_FOLLOW_TYPING_FOCUS_ACTIVATED_SESSION_REPORTED = 453;
+ ACCESSIBILITY_TEXT_READING_OPTIONS_CHANGED = 454;
+ WIFI_SETUP_FAILURE_CRASH_REPORTED = 455;
+ UWB_DEVICE_ERROR_REPORTED = 456;
+ ISOLATED_COMPILATION_SCHEDULED = 457;
+ ISOLATED_COMPILATION_ENDED = 458;
+ ONS_OPPORTUNISTIC_ESIM_PROVISIONING_COMPLETE = 459;
+ TELEPHONY_ANOMALY_DETECTED = 461;
+ LETTERBOX_POSITION_CHANGED = 462;
REMOTE_KEY_PROVISIONING_ATTEMPT = 463;
REMOTE_KEY_PROVISIONING_NETWORK_INFO = 464;
REMOTE_KEY_PROVISIONING_TIMING = 465;
+ MEDIAOUTPUT_OP_INTERACTION_REPORT = 466;
+ BACKGROUND_DEXOPT_JOB_ENDED = 467;
+ SYNC_EXEMPTION_OCCURRED = 468;
+ AUTOFILL_PRESENTATION_EVENT_REPORTED = 469;
+ DOCK_STATE_CHANGED = 470;
+ BROADCAST_DELIVERY_EVENT_REPORTED = 475;
+ SERVICE_REQUEST_EVENT_REPORTED = 476;
+ PROVIDER_ACQUISITION_EVENT_REPORTED = 477;
+ BLUETOOTH_DEVICE_NAME_REPORTED = 478;
+ VIBRATION_REPORTED = 487;
+ UWB_RANGING_START = 489;
+ DISPLAY_BRIGHTNESS_CHANGED = 494;
+ ACTIVITY_ACTION_BLOCKED = 495;
+ NETWORK_DNS_SERVER_SUPPORT_REPORTED = 504;
+ VM_BOOTED = 505;
+ VM_EXITED = 506;
+ AMBIENT_BRIGHTNESS_STATS_REPORTED = 507;
+ MEDIAMETRICS_SPATIALIZERCAPABILITIES_REPORTED = 508;
+ MEDIAMETRICS_SPATIALIZERDEVICEENABLED_REPORTED = 509;
+ MEDIAMETRICS_HEADTRACKERDEVICEENABLED_REPORTED = 510;
+ MEDIAMETRICS_HEADTRACKERDEVICESUPPORTED_REPORTED = 511;
+ HEARING_AID_INFO_REPORTED = 513;
+ DEVICE_WIDE_JOB_CONSTRAINT_CHANGED = 514;
+ IWLAN_SETUP_DATA_CALL_RESULT_REPORTED = 519;
+ IWLAN_PDN_DISCONNECTED_REASON_REPORTED = 520;
+ AIRPLANE_MODE_SESSION_REPORTED = 521;
+ VM_CPU_STATUS_REPORTED = 522;
+ VM_MEM_STATUS_REPORTED = 523;
+ DEFAULT_NETWORK_REMATCH_INFO = 525;
+ NETWORK_SELECTION_PERFORMANCE = 526;
+ NETWORK_NSD_REPORTED = 527;
+ BLUETOOTH_DISCONNECTION_REASON_REPORTED = 529;
+ BLUETOOTH_LOCAL_VERSIONS_REPORTED = 530;
+ BLUETOOTH_REMOTE_SUPPORTED_FEATURES_REPORTED = 531;
+ BLUETOOTH_LOCAL_SUPPORTED_FEATURES_REPORTED = 532;
+ BLUETOOTH_GATT_APP_INFO = 533;
+ BRIGHTNESS_CONFIGURATION_UPDATED = 534;
+ LAUNCHER_IMPRESSION_EVENT = 547;
+ ODSIGN_REPORTED = 548;
+ ART_DEVICE_DATUM_REPORTED = 550;
+ NETWORK_SLICE_SESSION_ENDED = 558;
+ NETWORK_SLICE_DAILY_DATA_USAGE_REPORTED = 559;
+ NFC_TAG_TYPE_OCCURRED = 560;
+ NFC_AID_CONFLICT_OCCURRED = 561;
+ NFC_READER_CONFLICT_OCCURRED = 562;
+ ART_DATUM_DELTA_REPORTED = 565;
+ MEDIA_DRM_CREATED = 568;
+ MEDIA_DRM_ERRORED = 569;
+ MEDIA_DRM_SESSION_OPENED = 570;
+ MEDIA_DRM_SESSION_CLOSED = 571;
+ PERFORMANCE_HINT_SESSION_REPORTED = 574;
+ HOTWORD_AUDIO_EGRESS_EVENT_REPORTED = 578;
+ NETWORK_VALIDATION_FAILURE_STATS_DAILY_REPORTED = 601;
WIFI_BYTES_TRANSFER = 10000;
WIFI_BYTES_TRANSFER_BY_FG_BG = 10001;
MOBILE_BYTES_TRANSFER = 10002;
@@ -1906,8 +2010,6 @@
CPU_TIME_PER_THREAD_FREQ = 10037;
ON_DEVICE_POWER_MEASUREMENT = 10038;
DEVICE_CALCULATED_POWER_USE = 10039;
- DEVICE_CALCULATED_POWER_BLAME_UID = 10040;
- DEVICE_CALCULATED_POWER_BLAME_OTHER = 10041;
PROCESS_MEMORY_HIGH_WATER_MARK = 10042;
BATTERY_LEVEL = 10043;
BUILD_INFORMATION = 10044;
@@ -1992,8 +2094,11 @@
KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO = 10123;
RKP_ERROR_STATS = 10124;
KEYSTORE2_CRASH_STATS = 10125;
+ VENDOR_APEX_INFO = 10126;
ACCESSIBILITY_SHORTCUT_STATS = 10127;
ACCESSIBILITY_FLOATING_MENU_STATS = 10128;
+ DATA_USAGE_BYTES_TRANSFER_V2 = 10129;
+ MEDIA_CAPABILITIES = 10130;
CAR_WATCHDOG_SYSTEM_IO_USAGE_SUMMARY = 10131;
CAR_WATCHDOG_UID_IO_USAGE_SUMMARY = 10132;
IMS_REGISTRATION_FEATURE_TAG_STATS = 10133;
@@ -2009,7 +2114,25 @@
UCE_EVENT_STATS = 10143;
PRESENCE_NOTIFY_EVENT = 10144;
GBA_EVENT = 10145;
+ PER_SIM_STATUS = 10146;
+ GPU_WORK_PER_UID = 10147;
+ PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE = 10148;
+ SIGNED_PARTITION_INFO = 10149;
+ PINNED_FILE_SIZES_PER_PACKAGE = 10150;
+ PENDING_INTENTS_PER_PACKAGE = 10151;
+ USER_INFO = 10152;
+ TELEPHONY_NETWORK_REQUESTS_V2 = 10153;
+ DEVICE_TELEPHONY_PROPERTIES = 10154;
REMOTE_KEY_PROVISIONING_ERROR_COUNTS = 10155;
+ INCOMING_MMS = 10157;
+ OUTGOING_MMS = 10158;
+ MULTI_USER_INFO = 10160;
+ NETWORK_BPF_MAP_INFO = 10161;
+ CONNECTIVITY_STATE_SAMPLE = 10163;
+ NETWORK_SELECTION_REMATCH_REASONS_INFO = 10164;
+ NETWORK_SLICE_REQUEST_COUNT = 10168;
+ ADPF_SYSTEM_COMPONENT_INFO = 10173;
+ NOTIFICATION_MEMORY_USE = 10174;
}
// End of protos/perfetto/config/statsd/atom_ids.proto
diff --git a/protos/perfetto/config/statsd/atom_ids.proto b/protos/perfetto/config/statsd/atom_ids.proto
index 2d987b4..4eed73b 100644
--- a/protos/perfetto/config/statsd/atom_ids.proto
+++ b/protos/perfetto/config/statsd/atom_ids.proto
@@ -99,7 +99,6 @@
WTF_OCCURRED = 80;
LOW_MEM_REPORTED = 81;
GENERIC_ATOM = 82;
- KEY_VALUE_PAIRS_ATOM = 83;
VIBRATOR_STATE_CHANGED = 84;
DEFERRED_JOB_STATS_REPORTED = 85;
THERMAL_THROTTLING = 86;
@@ -348,6 +347,7 @@
ART_DATUM_REPORTED = 332;
DEVICE_ROTATED = 333;
SIM_SPECIFIC_SETTINGS_RESTORED = 334;
+ TEXT_CLASSIFIER_DOWNLOAD_REPORTED = 335;
PIN_STORAGE_EVENT = 336;
FACE_DOWN_REPORTED = 337;
BLUETOOTH_HAL_CRASH_REASON_REPORTED = 338;
@@ -392,9 +392,12 @@
PRIVACY_SENSOR_TOGGLE_INTERACTION = 381;
PRIVACY_TOGGLE_DIALOG_INTERACTION = 382;
APP_SEARCH_OPTIMIZE_STATS_REPORTED = 383;
+ NON_A11Y_TOOL_SERVICE_WARNING_REPORT = 384;
+ APP_SEARCH_SET_SCHEMA_STATS_REPORTED = 385;
APP_COMPAT_STATE_CHANGED = 386;
SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED = 387;
SPLITSCREEN_UI_CHANGED = 388;
+ NETWORK_DNS_HANDSHAKE_REPORTED = 389;
BLUETOOTH_CODE_PATH_COUNTER = 390;
BLUETOOTH_LE_BATCH_SCAN_REPORT_DELAY = 392;
ACCESSIBILITY_FLOATING_MENU_UI_CHANGED = 393;
@@ -402,21 +405,122 @@
NEURALNETWORKS_EXECUTION_COMPLETED = 395;
NEURALNETWORKS_COMPILATION_FAILED = 396;
NEURALNETWORKS_EXECUTION_FAILED = 397;
+ CONTEXT_HUB_BOOTED = 398;
+ CONTEXT_HUB_RESTARTED = 399;
+ CONTEXT_HUB_LOADED_NANOAPP_SNAPSHOT_REPORTED = 400;
+ CHRE_CODE_DOWNLOAD_TRANSACTED = 401;
+ UWB_SESSION_INITED = 402;
+ UWB_SESSION_CLOSED = 403;
+ UWB_FIRST_RANGING_RECEIVED = 404;
+ UWB_RANGING_MEASUREMENT_RECEIVED = 405;
+ TEXT_CLASSIFIER_DOWNLOAD_WORK_SCHEDULED = 406;
+ TEXT_CLASSIFIER_DOWNLOAD_WORK_COMPLETED = 407;
+ CLIPBOARD_CLEARED = 408;
VM_CREATION_REQUESTED = 409;
+ NEARBY_DEVICE_SCAN_STATE_CHANGED = 410;
CAMERA_COMPAT_CONTROL_EVENT_REPORTED = 411;
- TRACING_SERVICE_REPORT_EVENT = 424;
+ APPLICATION_LOCALES_CHANGED = 412;
+ MEDIAMETRICS_AUDIOTRACKSTATUS_REPORTED = 413;
+ FOLD_STATE_DURATION_REPORTED = 414;
+ LOCATION_TIME_ZONE_PROVIDER_CONTROLLER_STATE_CHANGED = 415;
+ DISPLAY_HBM_STATE_CHANGED = 416;
+ DISPLAY_HBM_BRIGHTNESS_CHANGED = 417;
+ PERSISTENT_URI_PERMISSIONS_FLUSHED = 418;
EARLY_BOOT_COMP_OS_ARTIFACTS_CHECK_REPORTED = 419;
- ISOLATED_COMPILATION_SCHEDULED = 457;
- ISOLATED_COMPILATION_ENDED = 458;
- TELEPHONY_ANOMALY_DETECTED = 461;
+ VBMETA_DIGEST_REPORTED = 420;
+ APEX_INFO_GATHERED = 421;
+ PVM_INFO_GATHERED = 422;
+ WEAR_SETTINGS_UI_INTERACTED = 423;
+ TRACING_SERVICE_REPORT_EVENT = 424;
+ MEDIAMETRICS_AUDIORECORDSTATUS_REPORTED = 425;
+ LAUNCHER_LATENCY = 426;
+ DROPBOX_ENTRY_DROPPED = 427;
+ WIFI_P2P_CONNECTION_REPORTED = 428;
+ GAME_STATE_CHANGED = 429;
HOTWORD_DETECTOR_CREATE_REQUESTED = 430;
HOTWORD_DETECTION_SERVICE_INIT_RESULT_REPORTED = 431;
HOTWORD_DETECTION_SERVICE_RESTARTED = 432;
HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED = 433;
HOTWORD_DETECTOR_EVENTS = 434;
+ BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED = 437;
+ CONTACTS_INDEXER_UPDATE_STATS_REPORTED = 440;
+ APP_BACKGROUND_RESTRICTIONS_INFO = 441;
+ MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED = 442;
+ MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED = 443;
+ PERMISSION_REMINDER_NOTIFICATION_INTERACTED = 444;
+ RECENT_PERMISSION_DECISIONS_INTERACTED = 445;
+ GNSS_PSDS_DOWNLOAD_REPORTED = 446;
+ LE_AUDIO_CONNECTION_SESSION_REPORTED = 447;
+ LE_AUDIO_BROADCAST_SESSION_REPORTED = 448;
+ DREAM_UI_EVENT_REPORTED = 449;
+ TASK_MANAGER_EVENT_REPORTED = 450;
+ CDM_ASSOCIATION_ACTION = 451;
+ MAGNIFICATION_TRIPLE_TAP_AND_HOLD_ACTIVATED_SESSION_REPORTED = 452;
+ MAGNIFICATION_FOLLOW_TYPING_FOCUS_ACTIVATED_SESSION_REPORTED = 453;
+ ACCESSIBILITY_TEXT_READING_OPTIONS_CHANGED = 454;
+ WIFI_SETUP_FAILURE_CRASH_REPORTED = 455;
+ UWB_DEVICE_ERROR_REPORTED = 456;
+ ISOLATED_COMPILATION_SCHEDULED = 457;
+ ISOLATED_COMPILATION_ENDED = 458;
+ ONS_OPPORTUNISTIC_ESIM_PROVISIONING_COMPLETE = 459;
+ TELEPHONY_ANOMALY_DETECTED = 461;
+ LETTERBOX_POSITION_CHANGED = 462;
REMOTE_KEY_PROVISIONING_ATTEMPT = 463;
REMOTE_KEY_PROVISIONING_NETWORK_INFO = 464;
REMOTE_KEY_PROVISIONING_TIMING = 465;
+ MEDIAOUTPUT_OP_INTERACTION_REPORT = 466;
+ BACKGROUND_DEXOPT_JOB_ENDED = 467;
+ SYNC_EXEMPTION_OCCURRED = 468;
+ AUTOFILL_PRESENTATION_EVENT_REPORTED = 469;
+ DOCK_STATE_CHANGED = 470;
+ BROADCAST_DELIVERY_EVENT_REPORTED = 475;
+ SERVICE_REQUEST_EVENT_REPORTED = 476;
+ PROVIDER_ACQUISITION_EVENT_REPORTED = 477;
+ BLUETOOTH_DEVICE_NAME_REPORTED = 478;
+ VIBRATION_REPORTED = 487;
+ UWB_RANGING_START = 489;
+ DISPLAY_BRIGHTNESS_CHANGED = 494;
+ ACTIVITY_ACTION_BLOCKED = 495;
+ NETWORK_DNS_SERVER_SUPPORT_REPORTED = 504;
+ VM_BOOTED = 505;
+ VM_EXITED = 506;
+ AMBIENT_BRIGHTNESS_STATS_REPORTED = 507;
+ MEDIAMETRICS_SPATIALIZERCAPABILITIES_REPORTED = 508;
+ MEDIAMETRICS_SPATIALIZERDEVICEENABLED_REPORTED = 509;
+ MEDIAMETRICS_HEADTRACKERDEVICEENABLED_REPORTED = 510;
+ MEDIAMETRICS_HEADTRACKERDEVICESUPPORTED_REPORTED = 511;
+ HEARING_AID_INFO_REPORTED = 513;
+ DEVICE_WIDE_JOB_CONSTRAINT_CHANGED = 514;
+ IWLAN_SETUP_DATA_CALL_RESULT_REPORTED = 519;
+ IWLAN_PDN_DISCONNECTED_REASON_REPORTED = 520;
+ AIRPLANE_MODE_SESSION_REPORTED = 521;
+ VM_CPU_STATUS_REPORTED = 522;
+ VM_MEM_STATUS_REPORTED = 523;
+ DEFAULT_NETWORK_REMATCH_INFO = 525;
+ NETWORK_SELECTION_PERFORMANCE = 526;
+ NETWORK_NSD_REPORTED = 527;
+ BLUETOOTH_DISCONNECTION_REASON_REPORTED = 529;
+ BLUETOOTH_LOCAL_VERSIONS_REPORTED = 530;
+ BLUETOOTH_REMOTE_SUPPORTED_FEATURES_REPORTED = 531;
+ BLUETOOTH_LOCAL_SUPPORTED_FEATURES_REPORTED = 532;
+ BLUETOOTH_GATT_APP_INFO = 533;
+ BRIGHTNESS_CONFIGURATION_UPDATED = 534;
+ LAUNCHER_IMPRESSION_EVENT = 547;
+ ODSIGN_REPORTED = 548;
+ ART_DEVICE_DATUM_REPORTED = 550;
+ NETWORK_SLICE_SESSION_ENDED = 558;
+ NETWORK_SLICE_DAILY_DATA_USAGE_REPORTED = 559;
+ NFC_TAG_TYPE_OCCURRED = 560;
+ NFC_AID_CONFLICT_OCCURRED = 561;
+ NFC_READER_CONFLICT_OCCURRED = 562;
+ ART_DATUM_DELTA_REPORTED = 565;
+ MEDIA_DRM_CREATED = 568;
+ MEDIA_DRM_ERRORED = 569;
+ MEDIA_DRM_SESSION_OPENED = 570;
+ MEDIA_DRM_SESSION_CLOSED = 571;
+ PERFORMANCE_HINT_SESSION_REPORTED = 574;
+ HOTWORD_AUDIO_EGRESS_EVENT_REPORTED = 578;
+ NETWORK_VALIDATION_FAILURE_STATS_DAILY_REPORTED = 601;
WIFI_BYTES_TRANSFER = 10000;
WIFI_BYTES_TRANSFER_BY_FG_BG = 10001;
MOBILE_BYTES_TRANSFER = 10002;
@@ -455,8 +559,6 @@
CPU_TIME_PER_THREAD_FREQ = 10037;
ON_DEVICE_POWER_MEASUREMENT = 10038;
DEVICE_CALCULATED_POWER_USE = 10039;
- DEVICE_CALCULATED_POWER_BLAME_UID = 10040;
- DEVICE_CALCULATED_POWER_BLAME_OTHER = 10041;
PROCESS_MEMORY_HIGH_WATER_MARK = 10042;
BATTERY_LEVEL = 10043;
BUILD_INFORMATION = 10044;
@@ -541,8 +643,11 @@
KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO = 10123;
RKP_ERROR_STATS = 10124;
KEYSTORE2_CRASH_STATS = 10125;
+ VENDOR_APEX_INFO = 10126;
ACCESSIBILITY_SHORTCUT_STATS = 10127;
ACCESSIBILITY_FLOATING_MENU_STATS = 10128;
+ DATA_USAGE_BYTES_TRANSFER_V2 = 10129;
+ MEDIA_CAPABILITIES = 10130;
CAR_WATCHDOG_SYSTEM_IO_USAGE_SUMMARY = 10131;
CAR_WATCHDOG_UID_IO_USAGE_SUMMARY = 10132;
IMS_REGISTRATION_FEATURE_TAG_STATS = 10133;
@@ -558,5 +663,23 @@
UCE_EVENT_STATS = 10143;
PRESENCE_NOTIFY_EVENT = 10144;
GBA_EVENT = 10145;
+ PER_SIM_STATUS = 10146;
+ GPU_WORK_PER_UID = 10147;
+ PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE = 10148;
+ SIGNED_PARTITION_INFO = 10149;
+ PINNED_FILE_SIZES_PER_PACKAGE = 10150;
+ PENDING_INTENTS_PER_PACKAGE = 10151;
+ USER_INFO = 10152;
+ TELEPHONY_NETWORK_REQUESTS_V2 = 10153;
+ DEVICE_TELEPHONY_PROPERTIES = 10154;
REMOTE_KEY_PROVISIONING_ERROR_COUNTS = 10155;
+ INCOMING_MMS = 10157;
+ OUTGOING_MMS = 10158;
+ MULTI_USER_INFO = 10160;
+ NETWORK_BPF_MAP_INFO = 10161;
+ CONNECTIVITY_STATE_SAMPLE = 10163;
+ NETWORK_SELECTION_REMATCH_REASONS_INFO = 10164;
+ NETWORK_SLICE_REQUEST_COUNT = 10168;
+ ADPF_SYSTEM_COMPONENT_INFO = 10173;
+ NOTIFICATION_MEMORY_USE = 10174;
}
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index 74d2f17..d8400fa 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -1550,7 +1550,6 @@
WTF_OCCURRED = 80;
LOW_MEM_REPORTED = 81;
GENERIC_ATOM = 82;
- KEY_VALUE_PAIRS_ATOM = 83;
VIBRATOR_STATE_CHANGED = 84;
DEFERRED_JOB_STATS_REPORTED = 85;
THERMAL_THROTTLING = 86;
@@ -1799,6 +1798,7 @@
ART_DATUM_REPORTED = 332;
DEVICE_ROTATED = 333;
SIM_SPECIFIC_SETTINGS_RESTORED = 334;
+ TEXT_CLASSIFIER_DOWNLOAD_REPORTED = 335;
PIN_STORAGE_EVENT = 336;
FACE_DOWN_REPORTED = 337;
BLUETOOTH_HAL_CRASH_REASON_REPORTED = 338;
@@ -1843,9 +1843,12 @@
PRIVACY_SENSOR_TOGGLE_INTERACTION = 381;
PRIVACY_TOGGLE_DIALOG_INTERACTION = 382;
APP_SEARCH_OPTIMIZE_STATS_REPORTED = 383;
+ NON_A11Y_TOOL_SERVICE_WARNING_REPORT = 384;
+ APP_SEARCH_SET_SCHEMA_STATS_REPORTED = 385;
APP_COMPAT_STATE_CHANGED = 386;
SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED = 387;
SPLITSCREEN_UI_CHANGED = 388;
+ NETWORK_DNS_HANDSHAKE_REPORTED = 389;
BLUETOOTH_CODE_PATH_COUNTER = 390;
BLUETOOTH_LE_BATCH_SCAN_REPORT_DELAY = 392;
ACCESSIBILITY_FLOATING_MENU_UI_CHANGED = 393;
@@ -1853,21 +1856,122 @@
NEURALNETWORKS_EXECUTION_COMPLETED = 395;
NEURALNETWORKS_COMPILATION_FAILED = 396;
NEURALNETWORKS_EXECUTION_FAILED = 397;
+ CONTEXT_HUB_BOOTED = 398;
+ CONTEXT_HUB_RESTARTED = 399;
+ CONTEXT_HUB_LOADED_NANOAPP_SNAPSHOT_REPORTED = 400;
+ CHRE_CODE_DOWNLOAD_TRANSACTED = 401;
+ UWB_SESSION_INITED = 402;
+ UWB_SESSION_CLOSED = 403;
+ UWB_FIRST_RANGING_RECEIVED = 404;
+ UWB_RANGING_MEASUREMENT_RECEIVED = 405;
+ TEXT_CLASSIFIER_DOWNLOAD_WORK_SCHEDULED = 406;
+ TEXT_CLASSIFIER_DOWNLOAD_WORK_COMPLETED = 407;
+ CLIPBOARD_CLEARED = 408;
VM_CREATION_REQUESTED = 409;
+ NEARBY_DEVICE_SCAN_STATE_CHANGED = 410;
CAMERA_COMPAT_CONTROL_EVENT_REPORTED = 411;
- TRACING_SERVICE_REPORT_EVENT = 424;
+ APPLICATION_LOCALES_CHANGED = 412;
+ MEDIAMETRICS_AUDIOTRACKSTATUS_REPORTED = 413;
+ FOLD_STATE_DURATION_REPORTED = 414;
+ LOCATION_TIME_ZONE_PROVIDER_CONTROLLER_STATE_CHANGED = 415;
+ DISPLAY_HBM_STATE_CHANGED = 416;
+ DISPLAY_HBM_BRIGHTNESS_CHANGED = 417;
+ PERSISTENT_URI_PERMISSIONS_FLUSHED = 418;
EARLY_BOOT_COMP_OS_ARTIFACTS_CHECK_REPORTED = 419;
- ISOLATED_COMPILATION_SCHEDULED = 457;
- ISOLATED_COMPILATION_ENDED = 458;
- TELEPHONY_ANOMALY_DETECTED = 461;
+ VBMETA_DIGEST_REPORTED = 420;
+ APEX_INFO_GATHERED = 421;
+ PVM_INFO_GATHERED = 422;
+ WEAR_SETTINGS_UI_INTERACTED = 423;
+ TRACING_SERVICE_REPORT_EVENT = 424;
+ MEDIAMETRICS_AUDIORECORDSTATUS_REPORTED = 425;
+ LAUNCHER_LATENCY = 426;
+ DROPBOX_ENTRY_DROPPED = 427;
+ WIFI_P2P_CONNECTION_REPORTED = 428;
+ GAME_STATE_CHANGED = 429;
HOTWORD_DETECTOR_CREATE_REQUESTED = 430;
HOTWORD_DETECTION_SERVICE_INIT_RESULT_REPORTED = 431;
HOTWORD_DETECTION_SERVICE_RESTARTED = 432;
HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED = 433;
HOTWORD_DETECTOR_EVENTS = 434;
+ BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED = 437;
+ CONTACTS_INDEXER_UPDATE_STATS_REPORTED = 440;
+ APP_BACKGROUND_RESTRICTIONS_INFO = 441;
+ MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED = 442;
+ MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED = 443;
+ PERMISSION_REMINDER_NOTIFICATION_INTERACTED = 444;
+ RECENT_PERMISSION_DECISIONS_INTERACTED = 445;
+ GNSS_PSDS_DOWNLOAD_REPORTED = 446;
+ LE_AUDIO_CONNECTION_SESSION_REPORTED = 447;
+ LE_AUDIO_BROADCAST_SESSION_REPORTED = 448;
+ DREAM_UI_EVENT_REPORTED = 449;
+ TASK_MANAGER_EVENT_REPORTED = 450;
+ CDM_ASSOCIATION_ACTION = 451;
+ MAGNIFICATION_TRIPLE_TAP_AND_HOLD_ACTIVATED_SESSION_REPORTED = 452;
+ MAGNIFICATION_FOLLOW_TYPING_FOCUS_ACTIVATED_SESSION_REPORTED = 453;
+ ACCESSIBILITY_TEXT_READING_OPTIONS_CHANGED = 454;
+ WIFI_SETUP_FAILURE_CRASH_REPORTED = 455;
+ UWB_DEVICE_ERROR_REPORTED = 456;
+ ISOLATED_COMPILATION_SCHEDULED = 457;
+ ISOLATED_COMPILATION_ENDED = 458;
+ ONS_OPPORTUNISTIC_ESIM_PROVISIONING_COMPLETE = 459;
+ TELEPHONY_ANOMALY_DETECTED = 461;
+ LETTERBOX_POSITION_CHANGED = 462;
REMOTE_KEY_PROVISIONING_ATTEMPT = 463;
REMOTE_KEY_PROVISIONING_NETWORK_INFO = 464;
REMOTE_KEY_PROVISIONING_TIMING = 465;
+ MEDIAOUTPUT_OP_INTERACTION_REPORT = 466;
+ BACKGROUND_DEXOPT_JOB_ENDED = 467;
+ SYNC_EXEMPTION_OCCURRED = 468;
+ AUTOFILL_PRESENTATION_EVENT_REPORTED = 469;
+ DOCK_STATE_CHANGED = 470;
+ BROADCAST_DELIVERY_EVENT_REPORTED = 475;
+ SERVICE_REQUEST_EVENT_REPORTED = 476;
+ PROVIDER_ACQUISITION_EVENT_REPORTED = 477;
+ BLUETOOTH_DEVICE_NAME_REPORTED = 478;
+ VIBRATION_REPORTED = 487;
+ UWB_RANGING_START = 489;
+ DISPLAY_BRIGHTNESS_CHANGED = 494;
+ ACTIVITY_ACTION_BLOCKED = 495;
+ NETWORK_DNS_SERVER_SUPPORT_REPORTED = 504;
+ VM_BOOTED = 505;
+ VM_EXITED = 506;
+ AMBIENT_BRIGHTNESS_STATS_REPORTED = 507;
+ MEDIAMETRICS_SPATIALIZERCAPABILITIES_REPORTED = 508;
+ MEDIAMETRICS_SPATIALIZERDEVICEENABLED_REPORTED = 509;
+ MEDIAMETRICS_HEADTRACKERDEVICEENABLED_REPORTED = 510;
+ MEDIAMETRICS_HEADTRACKERDEVICESUPPORTED_REPORTED = 511;
+ HEARING_AID_INFO_REPORTED = 513;
+ DEVICE_WIDE_JOB_CONSTRAINT_CHANGED = 514;
+ IWLAN_SETUP_DATA_CALL_RESULT_REPORTED = 519;
+ IWLAN_PDN_DISCONNECTED_REASON_REPORTED = 520;
+ AIRPLANE_MODE_SESSION_REPORTED = 521;
+ VM_CPU_STATUS_REPORTED = 522;
+ VM_MEM_STATUS_REPORTED = 523;
+ DEFAULT_NETWORK_REMATCH_INFO = 525;
+ NETWORK_SELECTION_PERFORMANCE = 526;
+ NETWORK_NSD_REPORTED = 527;
+ BLUETOOTH_DISCONNECTION_REASON_REPORTED = 529;
+ BLUETOOTH_LOCAL_VERSIONS_REPORTED = 530;
+ BLUETOOTH_REMOTE_SUPPORTED_FEATURES_REPORTED = 531;
+ BLUETOOTH_LOCAL_SUPPORTED_FEATURES_REPORTED = 532;
+ BLUETOOTH_GATT_APP_INFO = 533;
+ BRIGHTNESS_CONFIGURATION_UPDATED = 534;
+ LAUNCHER_IMPRESSION_EVENT = 547;
+ ODSIGN_REPORTED = 548;
+ ART_DEVICE_DATUM_REPORTED = 550;
+ NETWORK_SLICE_SESSION_ENDED = 558;
+ NETWORK_SLICE_DAILY_DATA_USAGE_REPORTED = 559;
+ NFC_TAG_TYPE_OCCURRED = 560;
+ NFC_AID_CONFLICT_OCCURRED = 561;
+ NFC_READER_CONFLICT_OCCURRED = 562;
+ ART_DATUM_DELTA_REPORTED = 565;
+ MEDIA_DRM_CREATED = 568;
+ MEDIA_DRM_ERRORED = 569;
+ MEDIA_DRM_SESSION_OPENED = 570;
+ MEDIA_DRM_SESSION_CLOSED = 571;
+ PERFORMANCE_HINT_SESSION_REPORTED = 574;
+ HOTWORD_AUDIO_EGRESS_EVENT_REPORTED = 578;
+ NETWORK_VALIDATION_FAILURE_STATS_DAILY_REPORTED = 601;
WIFI_BYTES_TRANSFER = 10000;
WIFI_BYTES_TRANSFER_BY_FG_BG = 10001;
MOBILE_BYTES_TRANSFER = 10002;
@@ -1906,8 +2010,6 @@
CPU_TIME_PER_THREAD_FREQ = 10037;
ON_DEVICE_POWER_MEASUREMENT = 10038;
DEVICE_CALCULATED_POWER_USE = 10039;
- DEVICE_CALCULATED_POWER_BLAME_UID = 10040;
- DEVICE_CALCULATED_POWER_BLAME_OTHER = 10041;
PROCESS_MEMORY_HIGH_WATER_MARK = 10042;
BATTERY_LEVEL = 10043;
BUILD_INFORMATION = 10044;
@@ -1992,8 +2094,11 @@
KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO = 10123;
RKP_ERROR_STATS = 10124;
KEYSTORE2_CRASH_STATS = 10125;
+ VENDOR_APEX_INFO = 10126;
ACCESSIBILITY_SHORTCUT_STATS = 10127;
ACCESSIBILITY_FLOATING_MENU_STATS = 10128;
+ DATA_USAGE_BYTES_TRANSFER_V2 = 10129;
+ MEDIA_CAPABILITIES = 10130;
CAR_WATCHDOG_SYSTEM_IO_USAGE_SUMMARY = 10131;
CAR_WATCHDOG_UID_IO_USAGE_SUMMARY = 10132;
IMS_REGISTRATION_FEATURE_TAG_STATS = 10133;
@@ -2009,7 +2114,25 @@
UCE_EVENT_STATS = 10143;
PRESENCE_NOTIFY_EVENT = 10144;
GBA_EVENT = 10145;
+ PER_SIM_STATUS = 10146;
+ GPU_WORK_PER_UID = 10147;
+ PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE = 10148;
+ SIGNED_PARTITION_INFO = 10149;
+ PINNED_FILE_SIZES_PER_PACKAGE = 10150;
+ PENDING_INTENTS_PER_PACKAGE = 10151;
+ USER_INFO = 10152;
+ TELEPHONY_NETWORK_REQUESTS_V2 = 10153;
+ DEVICE_TELEPHONY_PROPERTIES = 10154;
REMOTE_KEY_PROVISIONING_ERROR_COUNTS = 10155;
+ INCOMING_MMS = 10157;
+ OUTGOING_MMS = 10158;
+ MULTI_USER_INFO = 10160;
+ NETWORK_BPF_MAP_INFO = 10161;
+ CONNECTIVITY_STATE_SAMPLE = 10163;
+ NETWORK_SELECTION_REMATCH_REASONS_INFO = 10164;
+ NETWORK_SLICE_REQUEST_COUNT = 10168;
+ ADPF_SYSTEM_COMPONENT_INFO = 10173;
+ NOTIFICATION_MEMORY_USE = 10174;
}
// End of protos/perfetto/config/statsd/atom_ids.proto
diff --git a/python/tools/update_permalink.py b/python/tools/update_permalink.py
index a6e8fab..56250fe 100755
--- a/python/tools/update_permalink.py
+++ b/python/tools/update_permalink.py
@@ -14,6 +14,65 @@
CURRENT_STATE_VERSION = 28
+def upgrade_15(old):
+ new = copy.deepcopy(old)
+ new["version"] = 16
+ new["flamegraphModalDismissed"] = False
+ return new
+
+
+def upgrade_16(old):
+ new = copy.deepcopy(old)
+ new["version"] = 17
+ new["nextId"] = max(old["nextId"], old["nextNoteId"], old["nextAreaId"])
+ engines = old["engines"]
+ if len(engines) > 0:
+ new["currentEngineId"] = list(engines.values())[0]['id']
+ return new
+
+
+def upgrade_17(old):
+ new = copy.deepcopy(old)
+ new["version"] = 18
+ # TODO(hjd): Update
+ return new
+
+
+def upgrade_18(old):
+ new = copy.deepcopy(old)
+ new["version"] = 19
+ # TODO(hjd): Update
+ return new
+
+
+def upgrade_19(old):
+ new = copy.deepcopy(old)
+ new["version"] = 20
+ # TODO(hjd): Update
+ return new
+
+
+def upgrade_20(old):
+ new = copy.deepcopy(old)
+ new["version"] = 21
+ # TODO(hjd): Update
+ return new
+
+
+def upgrade_20(old):
+ new = copy.deepcopy(old)
+ new["version"] = 22
+ # TODO(hjd): Update
+ return new
+
+
+def upgrade_21(old):
+ new = copy.deepcopy(old)
+ new["version"] = 22
+ # TODO(hjd): Update
+ return new
+
+
def upgrade_22(old):
new = copy.deepcopy(old)
new["version"] = 23
@@ -121,6 +180,8 @@
"--target-version",
help=f"Target state version (default: {CURRENT_STATE_VERSION})",
default=CURRENT_STATE_VERSION)
+ parser.add_argument(
+ "--verbose", help=f"Show debug information", action="store_true")
args = parser.parse_args()
permalink_url = args.permalink
@@ -132,7 +193,16 @@
old_state_version = old_json["version"]
new_state_version = args.target_version
+ print(json.dumps(old_json, sort_keys=True, indent=4))
+
UPGRADE = {
+ 15: upgrade_15,
+ 16: upgrade_16,
+ 17: upgrade_17,
+ 18: upgrade_18,
+ 19: upgrade_19,
+ 20: upgrade_20,
+ 21: upgrade_21,
22: upgrade_22,
23: upgrade_23,
24: upgrade_24,
diff --git a/src/trace_processor/importers/proto/atoms.descriptor b/src/trace_processor/importers/proto/atoms.descriptor
index 1ef00c0..daeacb7 100644
--- a/src/trace_processor/importers/proto/atoms.descriptor
+++ b/src/trace_processor/importers/proto/atoms.descriptor
Binary files differ
diff --git a/ui/src/common/event_set.ts b/ui/src/common/event_set.ts
index 87e62d5..3971fd8 100644
--- a/ui/src/common/event_set.ts
+++ b/ui/src/common/event_set.ts
@@ -43,7 +43,6 @@
export interface EmptyKeySet extends KeySet {
readonly id: typeof IdType;
}
-;
// A particular key/value pair on an Event matches the relevant entry
// on the KeySet if the KeyType and the value type 'match':
