am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair

Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp

* commit '507322ca5c5b678714314ae87e27d07c89c40785':
  Add the checking for mediaplayer stress test.

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java

@@ -86,6 +86,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
 
         } catch (Exception e) {
             Log.v(TAG, e.toString());
+            assertTrue("testStressHWDecoderRelease", false);
         }
     }
 
@@ -139,6 +140,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
 
         } catch (Exception e) {
             Log.v(TAG, e.toString());
+            assertTrue("testStressGetCurrentPosition", false);
         }
     }
 }