summaryrefslogtreecommitdiffstats
path: root/media/tests
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-05-06 15:48:33 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-06 15:48:33 -0700
commit56b7eeaa01fa34de1dad1b113f5355e999ee1d10 (patch)
tree56a8306e9e23f0abf2a730fb78c4d0c2b43c6ec0 /media/tests
parent761daf7550c256258886824fdb939b352c5fd08c (diff)
parentf3af740bdfc261b1cb25c0799af780d3753d4518 (diff)
downloadframeworks_base-56b7eeaa01fa34de1dad1b113f5355e999ee1d10.zip
frameworks_base-56b7eeaa01fa34de1dad1b113f5355e999ee1d10.tar.gz
frameworks_base-56b7eeaa01fa34de1dad1b113f5355e999ee1d10.tar.bz2
manual merge f3af740bdfc261b1cb25c0799af780d3753d4518
Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
Diffstat (limited to 'media/tests')
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
index da18e74..c75b96b 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
@@ -74,7 +74,19 @@ import android.media.AudioManager;
break;
}
}
-
+
+ for (type = ToneGenerator.TONE_SUP_INTERCEPT;
+ type <= ToneGenerator.TONE_SUP_PIP; type++) {
+ if (toneGen.startTone(type)) {
+ Thread.sleep(5000);
+ toneGen.stopTone();
+ Thread.sleep(200);
+ } else {
+ result = false;
+ break;
+ }
+ }
+
toneGen.release();
return result;
}