commit c8a9a00d25dcfbc8c2cf3e0e20166863ec37520c
author Andy Hung <hunga@google.com> Fri Oct 23 15:52:56 2015 -0700
committer Unsuk Jung <unsuk@google.com> Thu Nov 05 08:00:03 2015 -0800
tree 33fa72d04bb74d92a934fb5387c14150c462332c
parent cb22094bb7891d939b27edaaca5b507e087f0fac

Enable test of events occuring after AudioRecord.stop

Bug: 24744966
Change-Id: I27ecd23f5e35cd4f2cd98240fe80d98ef7f197f5

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

diff --git a/tests/tests/media/src/android/media/cts/AudioRecordTest.java b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
index 1865bb2..f7ebb4a 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
@@ -877,6 +877,8 @@
             // valid events, issuing right after stop completes. Except for those events,
             // no other events should show up after stop.
             // This behavior may change in the future but we account for it here in testing.
+            final long SLEEP_AFTER_STOP_FOR_EVENTS_MS = 30;
+            Thread.sleep(SLEEP_AFTER_STOP_FOR_EVENTS_MS);
             listener.stop();
 
             // clean up
@@ -1010,10 +1012,10 @@
                 assertEquals(AudioRecord.SUCCESS,
                         mAudioRecord.setNotificationMarkerPosition(mMarkerPosition));
             } else {
-                // stop() is not sufficient to end all notifications
-                // as is not synchronous with the event handling thread
-                // so we comment out the line below.
-                // fail("onMarkerReached called when not active");
+                // see comment on stop()
+                final long delta = System.currentTimeMillis() - mStopTime;
+                Log.d(TAG, "onMarkerReached called " + delta + " ms after stop");
+                fail("onMarkerReached called when not active");
             }
         }
 
@@ -1022,8 +1024,10 @@
                 int position = getPosition();
                 mOnPeriodicNotificationCalled.add(position);
             } else {
-                // see above comments about stop
-                // fail("onPeriodicNotification called when not active");
+                // see comment on stop()
+                final long delta = System.currentTimeMillis() - mStopTime;
+                Log.d(TAG, "onPeriodicNotification called " + delta + " ms after stop");
+                fail("onPeriodicNotification called when not active");
             }
         }
 
@@ -1034,7 +1038,10 @@
         }
 
         public synchronized void stop() {
+            // the listener should be stopped some time after AudioRecord is stopped
+            // as some messages may not yet be posted.
             mIsTestActive = false;
+            mStopTime = System.currentTimeMillis();
         }
 
         public ArrayList<Integer> getMarkerList() {
@@ -1059,6 +1066,7 @@
         }
 
         private long mStartTime;
+        private long mStopTime;
         private int mSampleRate;
         private boolean mIsTestActive = true;
         private AudioRecord mAudioRecord;