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

Commit b3469fca authored by Adithya Srinivasan's avatar Adithya Srinivasan Committed by Automerger Merge Worker
Browse files

Merge "Fix TimeStats layerName for transactions" into sc-dev am: ff9be0e8 

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

Change-Id: Icf7e4e3994dd894da89fd65e0270acb4e725802d
parents dd95f836 ff9be0e8

services/surfaceflinger/TimeStats/TimeStats.cpp

+2 −2
Original line number Diff line number Diff line
@@ -846,8 +846,8 @@ void TimeStats::incrementJankyFrames(const JankyFramesInfo& info) { 
        timelineStats.stats[layerKey].displayRefreshRateBucket = refreshRateBucket;

        timelineStats.stats[layerKey].renderRateBucket = renderRateBucket;

        timelineStats.stats[layerKey].uid = info.uid;

        timelineStats.stats[layerKey].layerName = kDefaultGameMode;

        timelineStats.stats[layerKey].gameMode = info.gameMode;

        timelineStats.stats[layerKey].layerName = kDefaultLayerName;

        timelineStats.stats[layerKey].gameMode = kDefaultGameMode;

    }



    TimeStatsHelper::TimeStatsLayer& timeStatsLayer = timelineStats.stats[layerKey];

services/surfaceflinger/TimeStats/TimeStats.h

+1 −9
Original line number Diff line number Diff line
@@ -16,18 +16,10 @@ 


#pragma once



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#include <cstdint>

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wextra"



#include <android/hardware/graphics/composer/2.4/IComposerClient.h>



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion -Wextra"



#include <../Fps.h>

#include <android/hardware/graphics/composer/2.4/IComposerClient.h>

#include <gui/JankInfo.h>

#include <timestatsproto/TimeStatsHelper.h>

#include <timestatsproto/TimeStatsProtoHeader.h>