commit 2ac41184ae00b2e99e55d995944288f33b2fce49
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 13 18:49:29 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 13 18:49:29 2020 +0000
tree 20fcb6c93017a2e23a0e7bf03f20bd780f48f67b
parent fbb38e2cae1fb2ff7374bbe5cfbe1bdfaf501cc8
parent b081c0a8cc77665fdb79c9696ad60690938bfe45

Merge "Update timedtext unittest"

media/libstagefright/timedtext/test/TimedTextUnitTest.cpp

diff --git a/media/libstagefright/timedtext/test/TimedTextUnitTest.cpp b/media/libstagefright/timedtext/test/TimedTextUnitTest.cpp
index 64379d6..d85ae39 100644
--- a/media/libstagefright/timedtext/test/TimedTextUnitTest.cpp
+++ b/media/libstagefright/timedtext/test/TimedTextUnitTest.cpp
@@ -346,6 +346,8 @@
         ASSERT_EQ(parcel.readInt32(), fontRecordEntries[i].fontNameLength)
                 << "Parcel has invalid value of font name length";
         uint8_t fontName[fontRecordEntries[i].fontNameLength];
+        // written with writeByteArray() writes count, then the actual data
+        ASSERT_EQ(parcel.readInt32(), fontRecordEntries[i].fontNameLength);
         status = parcel.read((void *)fontName, fontRecordEntries[i].fontNameLength);
         ASSERT_EQ(status, 0) << "Failed to read the font name from parcel";
         ASSERT_EQ(memcmp(fontName, fontRecordEntries[i].font, fontRecordEntries[i].fontNameLength),