Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74c6568f authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Sync flicker from master to sc-v2 am: 1388106f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15716702

Change-Id: I45c517259042e62495897c403f92752b44c12d8c
parents 896d71c7 1388106f

services/surfaceflinger/SurfaceInterceptor.h

+1 −1
Original line number Diff line number Diff line
@@ -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:

services/surfaceflinger/SurfaceTracing.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/surfaceflinger/tests/SurfaceInterceptor_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {