From 28cae0436826145dcc60023598f2c55f06479b63 Mon Sep 17 00:00:00 2001
From: Jimmy Dalqvist <jimmy.dalqvist@sonymobile.com>
Date: Fri, 12 Apr 2013 10:50:56 +0200
Subject: [PATCH] Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop

When calling AudioTrack.stop the system needs some time to stop
the audiotrack and set the position to 0.
The current sleep time of 100ms is not enough.
Update the test to use the same strategy as the CTS test,
which is to call getPlaybackHeadPosition multiple time before
giving up and failing the test.

Change-Id: Ie938929c009c41e101782b4a46ac01a0aa73ee34
---
 .../functional/audio/MediaAudioTrackTest.java        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
index e884aba7bcf70..eac5c28853d00 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
@@ -386,6 +386,7 @@ public class MediaAudioTrackTest extends ActivityInstrumentationTestCase2<MediaF
         final int TEST_FORMAT = AudioFormat.ENCODING_PCM_16BIT;
         final int TEST_MODE = AudioTrack.MODE_STREAM;
         final int TEST_STREAM_TYPE = AudioManager.STREAM_MUSIC;
+        final int TEST_LOOP_CNT = 10;
         
         //-------- initialization --------------
         int minBuffSize = AudioTrack.getMinBufferSize(TEST_SR, TEST_CONF, TEST_FORMAT);
@@ -399,9 +400,14 @@ public class MediaAudioTrackTest extends ActivityInstrumentationTestCase2<MediaF
         track.play();
         Thread.sleep(100);
         track.stop();
-        Thread.sleep(100); // TODO: what is a sensible value?
-        int pos = track.getPlaybackHeadPosition();
-        log(TEST_NAME, "position ="+ pos);
+        int count = 0;
+        int pos;
+        do {
+            Thread.sleep(200);
+            pos = track.getPlaybackHeadPosition();
+            count++;
+        } while((pos != 0) && (count < TEST_LOOP_CNT));
+        log(TEST_NAME, "position =" + pos + ", read count ="+count);
         assertTrue(TEST_NAME, pos == 0);
         //-------- tear down      --------------
         track.release();