diff options
| author | Steven Laver <lavers@google.com> | 2020-01-23 17:03:21 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2020-02-04 23:22:55 +0000 |
| commit | 71998c3d8b36220df1be12fe6e1ba7eda81cde41 (patch) | |
| tree | 8b5e07fadfa5561f430abd298094046a496c3fb3 /libs/hwui/ProfileData.cpp | |
| parent | 4307c64762e7fd78e8cdd955296655d51a6094e2 (diff) | |
| parent | db0ac39741da692dddac3ff31aa87634af92e1e8 (diff) | |
Merge RP1A.200123.001
Change-Id: I16a4437d9876db7a6a2b07231b4584df4564bee4
Diffstat (limited to 'libs/hwui/ProfileData.cpp')
| -rw-r--r-- | libs/hwui/ProfileData.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/hwui/ProfileData.cpp b/libs/hwui/ProfileData.cpp index 7921662b213c..a8e36e37905d 100644 --- a/libs/hwui/ProfileData.cpp +++ b/libs/hwui/ProfileData.cpp @@ -15,6 +15,7 @@ */ #include "ProfileData.h" +#include "Properties.h" #include <cinttypes> @@ -102,6 +103,7 @@ void ProfileData::mergeWith(const ProfileData& other) { mGPUFrameCounts[i] >>= divider; mGPUFrameCounts[i] += other.mGPUFrameCounts[i]; } + mPipelineType = other.mPipelineType; } void ProfileData::dump(int fd) const { @@ -157,6 +159,7 @@ void ProfileData::reset() { mTotalFrameCount = 0; mJankFrameCount = 0; mStatStartTime = systemTime(SYSTEM_TIME_MONOTONIC); + mPipelineType = Properties::getRenderPipelineType(); } void ProfileData::reportFrame(int64_t duration) { |