commit 8be494eb0998cc8f7f41c504c71c54856e169806
author Igor Murashkin <iam@google.com> Tue Mar 04 22:35:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 04 22:35:04 2014 +0000
tree 78e7b066845961d50fc60a1fb5c3e99290dae93e
parent 4a07dc8d2149788be96ad783c0d63339e6747587
parent 1738d4fca78b7678d09d5c8898e1f80fa63b4a6d

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

* commit '1738d4fca78b7678d09d5c8898e1f80fa63b4a6d':
  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]);