Merge "nuke MediaPlayerFlakyNetworkTest" into jb-mr1-dev
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
index c8edfd7..cf211b6 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
@@ -158,16 +158,18 @@
Bitmap bitmap = Bitmap.createBitmap(mBitmap.getWidth(), mBitmap.getHeight(),
mBitmap.getConfig());
+ intBuf1.position(0); // copyPixelsToBuffer adjusted the position, so rewind to start
bitmap.copyPixelsFromBuffer(intBuf1);
IntBuffer intBuf2 = IntBuffer.allocate(pixSize);
bitmap.copyPixelsToBuffer(intBuf2);
+ assertEquals(pixSize >> 2, intBuf2.position());
assertEquals(intBuf1.position(), intBuf2.position());
int size = intBuf1.position();
intBuf1.position(0);
intBuf2.position(0);
for (int i = 0; i < size; i++) {
- assertEquals(intBuf1.get(), intBuf2.get());
+ assertEquals("mismatching pixels at position " + i, intBuf1.get(), intBuf2.get());
}
}
diff --git a/tests/tests/media/src/android/media/cts/MediaRandomTest.java b/tests/tests/media/src/android/media/cts/MediaRandomTest.java
index adee09d..f99c927 100644
--- a/tests/tests/media/src/android/media/cts/MediaRandomTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRandomTest.java
@@ -172,6 +172,7 @@
}
public void testPlayerRandomAction() throws Exception {
+ Watchdog watchdog = new Watchdog(5000);
try {
mPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
@Override
@@ -193,7 +194,6 @@
Log.v(TAG, "seed = " + seed);
Random r = new Random(seed);
- Watchdog watchdog = new Watchdog(5000);
watchdog.start();
for (int i = 0; i < NUMBER_OF_PLAYER_RANDOM_ACTIONS; i++){
watchdog.ping();
@@ -248,14 +248,16 @@
}
}
mPlayer.stop();
- watchdog.end();
- watchdog.join();
} catch (Exception e) {
Log.v(TAG, e.toString());
+ } finally {
+ watchdog.end();
+ watchdog.join();
}
}
public void testRecorderRandomAction() throws Exception {
+ Watchdog watchdog = new Watchdog(5000);
try {
long seed = System.currentTimeMillis();
Log.v(TAG, "seed = " + seed);
@@ -276,7 +278,6 @@
final int[] width = {176, 352, 320, 640, 1280, 1920};
final int[] height = {144, 288, 240, 480, 720, 1080};
- Watchdog watchdog = new Watchdog(5000);
watchdog.start();
for (int i = 0; i < NUMBER_OF_RECORDER_RANDOM_ACTIONS; i++) {
watchdog.ping();
@@ -338,10 +339,11 @@
} catch (Exception e) {
}
}
- watchdog.end();
- watchdog.join();
} catch (Exception e) {
Log.v(TAG, e.toString());
+ } finally {
+ watchdog.end();
+ watchdog.join();
}
}
}
diff --git a/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java b/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java
index d1f5d05..f62b937 100644
--- a/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java
@@ -75,11 +75,13 @@
* </pre>
* @throws Throwable
*/
+/* some devices crash for wrong parameter, and that cannot be reliably tested.
public void test_glAttachedShaders_attach_same_shader() throws Throwable {
mActivity = getShaderActivity(Constants.SHADER, 3);
int error = mActivity.glGetError();
assertTrue(GLES20.GL_NO_ERROR != error);
}
+*/
/**
* Test: No shader is attached to a program, glGetAttachedShaders returns
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index efbdf3b..8d5a517 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -337,6 +337,8 @@
"/data/dump",
"/data/emt",
"/data/factory",
+ "/data/fics",
+ "/data/fics/dev",
"/data/fota",
"/data/gps",
"/data/gps/log",
diff --git a/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java
index e034562..a498bca 100644
--- a/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java
@@ -36,11 +36,6 @@
}
public void testConstructor() {
- try {
- new RelativeLayout.LayoutParams(getActivity(), null);
- fail("Should throw RuntimeException");
- } catch (RuntimeException e) {
- }
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
assertEquals(200, layoutParams.width);
