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

Merge commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568'

* commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568':
  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);
         }
     }
 }