diff options
| author | Jean-Michel Trivi <> | 2009-04-02 16:14:14 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 16:14:14 -0700 |
| commit | 655434763fd0fffc5858301040f05d6e81b248b9 (patch) | |
| tree | 0640d7529020dd614d2fb05f67cb565592c27484 /media/tests | |
| parent | 1b01f87b395a0c40d204f84ec09a66e3b4e31772 (diff) | |
| download | frameworks_base-655434763fd0fffc5858301040f05d6e81b248b9.zip frameworks_base-655434763fd0fffc5858301040f05d6e81b248b9.tar.gz frameworks_base-655434763fd0fffc5858301040f05d6e81b248b9.tar.bz2 | |
AI 144327: am: CL 144326 Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 144327
Diffstat (limited to 'media/tests')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java | 4 |
1 files changed, 2 insertions, 2 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 c30db38..fa0986a 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java @@ -228,8 +228,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe */ @LargeTest public void testTakePicture() throws Exception { - initializeMessageLooper(); synchronized (lock) { + initializeMessageLooper(); try { lock.wait(WAIT_FOR_COMMAND_TO_COMPLETE); } catch(Exception e) { @@ -250,8 +250,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe */ @LargeTest public void testCheckPreview() throws Exception { - initializeMessageLooper(); synchronized (lock) { + initializeMessageLooper(); try { lock.wait(WAIT_FOR_COMMAND_TO_COMPLETE); } catch(Exception e) { |