Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FrameMetricsObserver crash

Browse Source 
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
This commit is contained in:
John Reck
2016-08-02 09:38:26 -07:00
parent c1b853ebfb
commit 65ddb154c7
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/FrameMetrics.java
View File

@@ -198,7 +198,7 @@ public final class FrameMetrics {
int SWAP_BUFFERS = 12; int SWAP_BUFFERS = 12;
int FRAME_COMPLETED = 13; int FRAME_COMPLETED = 13;
int FRAME_STATS_COUNT = 14; // must always be last int FRAME_STATS_COUNT = 16; // must always be last
} }
/* /*

3
libs/hwui/FrameInfo.cpp
View File

@@ -43,6 +43,9 @@ static_assert((sizeof(FrameInfoNames)/sizeof(FrameInfoNames[0]))
== static_cast<int>(FrameInfoIndex::NumIndexes), == static_cast<int>(FrameInfoIndex::NumIndexes),
"size mismatch: FrameInfoNames doesn't match the enum!"); "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) { void FrameInfo::importUiThreadInfo(int64_t* info) {
memcpy(mFrameInfo, info, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t)); memcpy(mFrameInfo, info, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t));
} }

1
libs/hwui/FrameInfo.h
View File

@@ -52,6 +52,7 @@ enum class FrameInfoIndex {
QueueBufferDuration, QueueBufferDuration,
// Must be the last value! // Must be the last value!
// Also must be kept in sync with FrameMetrics.java#FRAME_STATS_COUNT
NumIndexes NumIndexes
}; };