diff options
| author | 2021-09-04 00:36:04 +0000 | |
|---|---|---|
| committer | 2021-09-04 00:36:04 +0000 | |
| commit | 74c6568f16497d1ddd7ffbabd3fd28f9abd1294f (patch) | |
| tree | 921f5dc9e5fe1fd1c19460cdcbddfd27e00f2735 | |
| parent | 896d71c74c66b35bbf245f28176f89d5043b63b5 (diff) | |
| parent | 1388106f8f1843777862653ca5fd2dfcaa766077 (diff) | |
[DO NOT MERGE] Sync flicker from master to sc-v2 am: 1388106f8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15716702
Change-Id: I45c517259042e62495897c403f92752b44c12d8c
| -rw-r--r-- | services/surfaceflinger/SurfaceInterceptor.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceTracing.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/SurfaceInterceptor_test.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/services/surfaceflinger/SurfaceInterceptor.h b/services/surfaceflinger/SurfaceInterceptor.h index 9a3ce2c58d..7b331b9f5f 100644 --- a/services/surfaceflinger/SurfaceInterceptor.h +++ b/services/surfaceflinger/SurfaceInterceptor.h @@ -48,7 +48,7 @@ using SurfaceChange = surfaceflinger::SurfaceChange; using Increment = surfaceflinger::Increment; using DisplayChange = surfaceflinger::DisplayChange; -constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.pb"; +constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.winscope"; class SurfaceInterceptor : public IBinder::DeathRecipient { public: diff --git a/services/surfaceflinger/SurfaceTracing.h b/services/surfaceflinger/SurfaceTracing.h index d4cf6f364c..cea1a3324e 100644 --- a/services/surfaceflinger/SurfaceTracing.h +++ b/services/surfaceflinger/SurfaceTracing.h @@ -78,7 +78,7 @@ public: private: class Runner; static constexpr auto DEFAULT_BUFFER_SIZE = 5_MB; - static constexpr auto DEFAULT_FILE_NAME = "/data/misc/wmtrace/layers_trace.pb"; + static constexpr auto DEFAULT_FILE_NAME = "/data/misc/wmtrace/layers_trace.winscope"; SurfaceFlinger& mFlinger; mutable std::mutex mTraceLock; diff --git a/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp b/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp index d5890ffa79..a42405989f 100644 --- a/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp +++ b/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp @@ -61,7 +61,7 @@ constexpr auto UNIQUE_TEST_FG_SURFACE_NAME = "FG Interceptor Test Surface#0"; constexpr auto LAYER_NAME = "Layer Create and Delete Test"; constexpr auto UNIQUE_LAYER_NAME = "Layer Create and Delete Test#0"; -constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.pb"; +constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.winscope"; // Fill an RGBA_8888 formatted surface with a single color. static void fillSurfaceRGBA8(const sp<SurfaceControl>& sc, uint8_t r, uint8_t g, uint8_t b) { |