From 24368e791ec244d84cfaa837a9f12803a24317e4 Mon Sep 17 00:00:00 2001 From: Nolan Scobie Date: Wed, 13 Sep 2023 18:13:25 -0400 Subject: [PATCH] Tweak sysprop prefix used by android.sdk_sysprop_guard These sysprop names are still changeable (without needing to be topic synchronized with other CLs) until other HWUI / RenderEngine CLs land. Bug: 279614916 Test: presubmit Change-Id: I1c852aae06d8f0b69aa8bf1340a5e7962a257f22 --- .../android/android_sdk_sysprop_guard_config.proto | 12 ++++++------ protos/perfetto/config/perfetto_config.proto | 12 ++++++------ protos/perfetto/trace/perfetto_trace.proto | 12 ++++++------ src/traced/service/builtin_producer.cc | 10 +++++----- src/traced/service/builtin_producer_unittest.cc | 10 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto b/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto index 4bacd58422..44b4f1af2f 100644 --- a/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto +++ b/protos/perfetto/config/android/android_sdk_sysprop_guard_config.proto @@ -48,8 +48,8 @@ message AndroidSdkSyspropGuardConfig { // restarted. // // Specifically this sets the following system properties: - // - debug.renderengine.skia_tracing_enabled - // - debug.renderengine.skia_use_perfetto_track_events + // - debug.tracing.renderengine.skia_tracing_enabled + // - debug.tracing.renderengine.skia_use_perfetto_track_events // // Does not affect actual track_event data *collection*, which must be // configured seperately. @@ -65,12 +65,12 @@ message AndroidSdkSyspropGuardConfig { // // ATTENTION: affects ALL HWUI APPS if hwui_package_name_filter is not set! // If filtering is NOT set, this controls these GLOBAL system properties: - // - debug.hwui.skia_tracing_enabled - // - debug.hwui.skia_use_perfetto_track_events + // - debug.tracing.hwui.skia_tracing_enabled + // - debug.tracing.hwui.skia_use_perfetto_track_events // If filtering IS set, this controls these APP-SPECIFIC system properties, // for each package listed in the filter: - // - debug.hwui.skia_tracing_enabled. - // - debug.hwui.skia_use_perfetto_track_events. + // - debug.tracing.hwui.skia_tracing_enabled. + // - debug.tracing.hwui.skia_use_perfetto_track_events. // // Does not affect actual track_event data *collection*, which must be // configured seperately. diff --git a/protos/perfetto/config/perfetto_config.proto b/protos/perfetto/config/perfetto_config.proto index a259573189..a9d53e6eea 100644 --- a/protos/perfetto/config/perfetto_config.proto +++ b/protos/perfetto/config/perfetto_config.proto @@ -436,8 +436,8 @@ message AndroidSdkSyspropGuardConfig { // restarted. // // Specifically this sets the following system properties: - // - debug.renderengine.skia_tracing_enabled - // - debug.renderengine.skia_use_perfetto_track_events + // - debug.tracing.renderengine.skia_tracing_enabled + // - debug.tracing.renderengine.skia_use_perfetto_track_events // // Does not affect actual track_event data *collection*, which must be // configured seperately. @@ -453,12 +453,12 @@ message AndroidSdkSyspropGuardConfig { // // ATTENTION: affects ALL HWUI APPS if hwui_package_name_filter is not set! // If filtering is NOT set, this controls these GLOBAL system properties: - // - debug.hwui.skia_tracing_enabled - // - debug.hwui.skia_use_perfetto_track_events + // - debug.tracing.hwui.skia_tracing_enabled + // - debug.tracing.hwui.skia_use_perfetto_track_events // If filtering IS set, this controls these APP-SPECIFIC system properties, // for each package listed in the filter: - // - debug.hwui.skia_tracing_enabled. - // - debug.hwui.skia_use_perfetto_track_events. + // - debug.tracing.hwui.skia_tracing_enabled. + // - debug.tracing.hwui.skia_use_perfetto_track_events. // // Does not affect actual track_event data *collection*, which must be // configured seperately. diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto index 460ffcefde..34039ff8ec 100644 --- a/protos/perfetto/trace/perfetto_trace.proto +++ b/protos/perfetto/trace/perfetto_trace.proto @@ -436,8 +436,8 @@ message AndroidSdkSyspropGuardConfig { // restarted. // // Specifically this sets the following system properties: - // - debug.renderengine.skia_tracing_enabled - // - debug.renderengine.skia_use_perfetto_track_events + // - debug.tracing.renderengine.skia_tracing_enabled + // - debug.tracing.renderengine.skia_use_perfetto_track_events // // Does not affect actual track_event data *collection*, which must be // configured seperately. @@ -453,12 +453,12 @@ message AndroidSdkSyspropGuardConfig { // // ATTENTION: affects ALL HWUI APPS if hwui_package_name_filter is not set! // If filtering is NOT set, this controls these GLOBAL system properties: - // - debug.hwui.skia_tracing_enabled - // - debug.hwui.skia_use_perfetto_track_events + // - debug.tracing.hwui.skia_tracing_enabled + // - debug.tracing.hwui.skia_use_perfetto_track_events // If filtering IS set, this controls these APP-SPECIFIC system properties, // for each package listed in the filter: - // - debug.hwui.skia_tracing_enabled. - // - debug.hwui.skia_use_perfetto_track_events. + // - debug.tracing.hwui.skia_tracing_enabled. + // - debug.tracing.hwui.skia_use_perfetto_track_events. // // Does not affect actual track_event data *collection*, which must be // configured seperately. diff --git a/src/traced/service/builtin_producer.cc b/src/traced/service/builtin_producer.cc index b9c5a97d39..5a89a59997 100644 --- a/src/traced/service/builtin_producer.cc +++ b/src/traced/service/builtin_producer.cc @@ -57,16 +57,16 @@ constexpr char kJavaHprofOomActivePropertyName[] = "traced.oome_heap_session.cou constexpr char kAndroidSdkSyspropGuardDataSourceName[] = "android.sdk_sysprop_guard"; constexpr char kPerfettoSdkSyspropGuardGenerationPropertyName[] = - "debug.perfetto.sdk_sysprop_guard_generation"; + "debug.tracing.perfetto.sdk_sysprop_guard_generation"; constexpr char kHwuiSkiaBroadTracingPropertyName[] = - "debug.hwui.skia_tracing_enabled"; + "debug.tracing.hwui.skia_tracing_enabled"; constexpr char kHwuiSkiaUsePerfettoPropertyName[] = - "debug.hwui.skia_use_perfetto_track_events"; + "debug.tracing.hwui.skia_use_perfetto_track_events"; constexpr char kHwuiSkiaPropertyPackageSeparator[] = "."; constexpr char kSurfaceFlingerSkiaBroadTracingPropertyName[] = - "debug.renderengine.skia_tracing_enabled"; + "debug.tracing.renderengine.skia_tracing_enabled"; constexpr char kSurfaceFlingerSkiaUsePerfettoPropertyName[] = - "debug.renderengine.skia_use_perfetto_track_events"; + "debug.tracing.renderengine.skia_use_perfetto_track_events"; } // namespace diff --git a/src/traced/service/builtin_producer_unittest.cc b/src/traced/service/builtin_producer_unittest.cc index 2718b31549..7d96dee946 100644 --- a/src/traced/service/builtin_producer_unittest.cc +++ b/src/traced/service/builtin_producer_unittest.cc @@ -33,16 +33,16 @@ constexpr char kLazyTracedPerfPropertyName[] = "traced.lazy.traced_perf"; constexpr char kAndroidSdkSyspropGuardDataSourceName[] = "android.sdk_sysprop_guard"; constexpr char kPerfettoSdkSyspropGuardGenerationPropertyName[] = - "debug.perfetto.sdk_sysprop_guard_generation"; + "debug.tracing.perfetto.sdk_sysprop_guard_generation"; constexpr char kHwuiSkiaBroadTracingPropertyName[] = - "debug.hwui.skia_tracing_enabled"; + "debug.tracing.hwui.skia_tracing_enabled"; constexpr char kHwuiSkiaUsePerfettoPropertyName[] = - "debug.hwui.skia_use_perfetto_track_events"; + "debug.tracing.hwui.skia_use_perfetto_track_events"; constexpr char kHwuiSkiaPropertyPackageSeparator[] = "."; constexpr char kSurfaceFlingerSkiaBroadTracingPropertyName[] = - "debug.renderengine.skia_tracing_enabled"; + "debug.tracing.renderengine.skia_tracing_enabled"; constexpr char kSurfaceFlingerSkiaUsePerfettoPropertyName[] = - "debug.renderengine.skia_use_perfetto_track_events"; + "debug.tracing.renderengine.skia_use_perfetto_track_events"; using ::testing::_; using ::testing::InvokeWithoutArgs;