summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2016-08-02 09:38:26 -0700
committerJohn Reck <jreck@google.com>2016-08-02 09:38:26 -0700
commit65ddb154c75126bbef8bf03494e6fd0d98ee0127 (patch)
tree584954a6e87f852a81261fed6ecae594fab8c919 /libs
parentc1b853ebfba7b8ff67919bb43dd73c80074d1a3b (diff)
downloadandroid-frameworks-base-65ddb154c75126bbef8bf03494e6fd0d98ee0127.tar.gz
android-frameworks-base-65ddb154c75126bbef8bf03494e6fd0d98ee0127.tar.xz
Fix FrameMetricsObserver crash
Bug: 30587465 Someday maybe the technology will exist to allow sharing a simple constant between Java and C++, but today is not that day. Change-Id: I17694746cb8712058133cd5ea10c47b9909f740b
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/FrameInfo.cpp3
-rw-r--r--libs/hwui/FrameInfo.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/FrameInfo.cpp b/libs/hwui/FrameInfo.cpp
index 09b3945..826f0bb 100644
--- a/libs/hwui/FrameInfo.cpp
+++ b/libs/hwui/FrameInfo.cpp
@@ -43,6 +43,9 @@ static_assert((sizeof(FrameInfoNames)/sizeof(FrameInfoNames[0]))
== static_cast<int>(FrameInfoIndex::NumIndexes),
"size mismatch: FrameInfoNames doesn't match the enum!");
+static_assert(static_cast<int>(FrameInfoIndex::NumIndexes) == 16,
+ "Must update value in FrameMetrics.java#FRAME_STATS_COUNT (and here)");
+
void FrameInfo::importUiThreadInfo(int64_t* info) {
memcpy(mFrameInfo, info, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t));
}
diff --git a/libs/hwui/FrameInfo.h b/libs/hwui/FrameInfo.h
index 1fe5459..45b57de 100644
--- a/libs/hwui/FrameInfo.h
+++ b/libs/hwui/FrameInfo.h
@@ -52,6 +52,7 @@ enum class FrameInfoIndex {
QueueBufferDuration,
// Must be the last value!
+ // Also must be kept in sync with FrameMetrics.java#FRAME_STATS_COUNT
NumIndexes
};