Merge "Tweak sysprop prefix used by android.sdk_sysprop_guard" into main

google · Sep 14, 2023 · 487532a · 487532a
2 parents 88ba9fa + 24368e7
commit 487532a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 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
@@ -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.<package.name>
-  //   - debug.hwui.skia_use_perfetto_track_events.<package.name>
+  //   - debug.tracing.hwui.skia_tracing_enabled.<package.name>
+  //   - debug.tracing.hwui.skia_use_perfetto_track_events.<package.name>
   //
   // 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
@@ -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.<package.name>
-  //   - debug.hwui.skia_use_perfetto_track_events.<package.name>
+  //   - debug.tracing.hwui.skia_tracing_enabled.<package.name>
+  //   - debug.tracing.hwui.skia_use_perfetto_track_events.<package.name>
   //
   // 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
@@ -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.<package.name>
-  //   - debug.hwui.skia_use_perfetto_track_events.<package.name>
+  //   - debug.tracing.hwui.skia_tracing_enabled.<package.name>
+  //   - debug.tracing.hwui.skia_use_perfetto_track_events.<package.name>
   //
   // 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
@@ -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
@@ -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;