commit 462fb3a8d597fffef3d5534544428d5cee9d8c16
author Igor Murashkin <iam@google.com> Tue Mar 04 21:05:40 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 04 21:05:41 2014 +0000
tree 6a835104bf77b1c041e4994c4831379d0a3a2802
parent 61d6a00895d2e8b9085278d0acbf98c19e7d6ed5
parent 8f76b6bedf5c0b316d02a9f9de3d504c0344cb81

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

libs/gui/tests/CpuConsumer_test.cpp

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 @@
     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]);