Merge "gui: Fix return code assert in CpuConsumer_test."

This commit is contained in:
Igor Murashkin 2014-03-04 21:05:40 +00:00 committed by Gerrit Code Review
commit 462fb3a8d5

View File

@ -656,7 +656,7 @@ TEST_P(CpuConsumerTest, FromCpuLockMax) {
ALOGV("Locking frame %d (too many)", params.maxLockedBuffers); ALOGV("Locking frame %d (too many)", params.maxLockedBuffers);
CpuConsumer::LockedBuffer bTooMuch; CpuConsumer::LockedBuffer bTooMuch;
err = mCC->lockNextBuffer(&bTooMuch); err = mCC->lockNextBuffer(&bTooMuch);
ASSERT_TRUE(err == INVALID_OPERATION) << "Allowing too many locks"; ASSERT_TRUE(err == NOT_ENOUGH_DATA) << "Allowing too many locks";
ALOGV("Unlocking frame 0"); ALOGV("Unlocking frame 0");
err = mCC->unlockBuffer(b[0]); err = mCC->unlockBuffer(b[0]);