Merge "Add DisplayId to DesiredActiveModeChanged trace"

#include <android-base/thread_annotations.h>

#include <android/native_window.h>

#include <binder/IBinder.h>

#include <ftl/concat.h>

#include <gui/LayerState.h>

#include <math/mat4.h>

#include <renderengine/RenderEngine.h>

    mutable std::mutex mActiveModeLock;

    ActiveModeInfo mDesiredActiveMode GUARDED_BY(mActiveModeLock);

    TracedOrdinal<bool> mDesiredActiveModeChanged

            GUARDED_BY(mActiveModeLock) = {"DesiredActiveModeChanged", false};

    TracedOrdinal<bool> mDesiredActiveModeChanged GUARDED_BY(mActiveModeLock) =

            {ftl::Concat("DesiredActiveModeChanged-", getId().value).c_str(), false};

    ActiveModeInfo mUpcomingActiveMode GUARDED_BY(kMainThreadContext);

};