commit 78ba3c4677ba6cb19dc1ce666375deb73b598709
author Daniel Xie <dxie@google.com> Thu Nov 05 01:38:26 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 05 01:38:26 2015 +0000
tree 6b44353a17336d2052cd6027313c2c98a16a12c7
parent 3f88be15efc1ca6f72240185c22504755eceffc9
parent 3cf33b62b0b043da2360c6aace5d9531571ee6a6

Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev

tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java

diff --git a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
index 014c1a5..89d6efa 100644
--- a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
@@ -657,7 +657,6 @@
             } catch (InterruptedException e) {
                 // don't care
             }
-            cleanupGl();
             mCompositionThread = null;
             mSurface = null;
             mStartCompletionSemaphore = null;
@@ -967,7 +966,6 @@
 
             public void cleanup() {
                 mNumTextureUpdated.set(0);
-                mVerticesData.clear();
                 if (mTextureId != 0) {
                     int[] textures = new int[] {
                             mTextureId