diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 20:08:16 -0500 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 20:08:16 -0500 |
| commit | d6af2e0cbf144b091d9c9d1bf2f3061547220c80 (patch) | |
| tree | 18ef273caf598c8b1586a33d8b3cfc50d04be050 | |
| parent | 774d956d5d2f6bece15c10c0db275596148c7ef8 (diff) | |
| parent | 43a335c3cc8c78d64703b9f4755c3cef595e3839 (diff) | |
| download | frameworks_base-d6af2e0cbf144b091d9c9d1bf2f3061547220c80.zip frameworks_base-d6af2e0cbf144b091d9c9d1bf2f3061547220c80.tar.gz frameworks_base-d6af2e0cbf144b091d9c9d1bf2f3061547220c80.tar.bz2 | |
Merge change I43a335c3 into eclair
* changes:
Suppress takePicture test from continuous DO NOT MERGE.
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java index fa0986a..e66e560 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java @@ -226,7 +226,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe * Test case 1: Take a picture and verify all the callback * functions are called properly. */ - @LargeTest + // TODO: add this back to LargeTest once bug 2141755 is fixed + // @LargeTest public void testTakePicture() throws Exception { synchronized (lock) { initializeMessageLooper(); |