ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test." 

* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
  gui: Fix return code assert in CpuConsumer_test.
This commit is contained in:
Igor Murashkin 2014-03-04 21:10:33 +00:00 committed by Android Git Automerger
parent eac548c65c 462fb3a8d5
commit 1738d4fca7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gui/tests/CpuConsumer_test.cpp
View File

@ -656,7 +656,7 @@ TEST_P(CpuConsumerTest, FromCpuLockMax) {
ALOGV("Locking frame %d (too many)", params.maxLockedBuffers);
CpuConsumer::LockedBuffer 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");
err = mCC->unlockBuffer(b[0]);