commit 97a8cc3c247e65d0b4d7428d5cc283340a63bf4d
author Daniel Xie <dxie@google.com> Wed Nov 04 07:57:45 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 04 07:57:45 2015 +0000
tree 2fe7651dea6993304b0f844076addca414ca00d6
parent 9ddec62e6a6a34f9f0f974c0964a308b688208e2
parent 10b5ab972ed2aa6289cbd2a2609adc48f8ecaec7

Merge "DO NOT MERGE: fixed build breakage" 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 89d6efa..014c1a5 100644
--- a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
@@ -657,6 +657,7 @@
             } catch (InterruptedException e) {
                 // don't care
             }
+            cleanupGl();
             mCompositionThread = null;
             mSurface = null;
             mStartCompletionSemaphore = null;
@@ -966,6 +967,7 @@
 
             public void cleanup() {
                 mNumTextureUpdated.set(0);
+                mVerticesData.clear();
                 if (mTextureId != 0) {
                     int[] textures = new int[] {
                             mTextureId