Fix FrameMetricsObserver crash am: 65ddb154c7

am: 6e30f4c789

Change-Id: Ic1bc80f8bbd20ce73f9e32c3a7457ad876c28476

core/java/android/view/FrameMetrics.java

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

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));
 }

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
 };