From e398e3bf2288fe60041396077d6fc0f81b0ab242 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <>
Date: Thu, 2 Apr 2009 23:26:11 -0700
Subject: [PATCH] AI 144409: am: CL 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/...   Original author: android-build

Automated import of CL 144409
---
 .../com/android/mediaframeworktest/functional/CameraTest.java | 4 ++--
 1 file 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 c30db38317437..fa0986ab68d81 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) {