diff options
| author | Igor Murashkin <iam@google.com> | 2014-03-11 18:29:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:29:24 +0000 |
| commit | a9a80939a7c0cbc3d745672317ff7a8b855f0780 (patch) | |
| tree | d90ba9aa5bf0c82b284643f763a0bf8d91091a6f | |
| parent | 11b8885445c4141375caf77b2975133b3c290eab (diff) | |
| parent | 462fb3a8d597fffef3d5534544428d5cee9d8c16 (diff) | |
| download | frameworks_native-a9a80939a7c0cbc3d745672317ff7a8b855f0780.zip frameworks_native-a9a80939a7c0cbc3d745672317ff7a8b855f0780.tar.gz frameworks_native-a9a80939a7c0cbc3d745672317ff7a8b855f0780.tar.bz2 | |
am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."
* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
gui: Fix return code assert in CpuConsumer_test.
| -rw-r--r-- | libs/gui/tests/CpuConsumer_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/tests/CpuConsumer_test.cpp b/libs/gui/tests/CpuConsumer_test.cpp index afbc026..b370a2d 100644 --- a/libs/gui/tests/CpuConsumer_test.cpp +++ b/libs/gui/tests/CpuConsumer_test.cpp @@ -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]); |