Merge "Remove AbsoluteLayout check for AttributeSet NPE" 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/MediaPlayerFlakyNetworkTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
index 21f2669..10a563c 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
@@ -63,7 +63,7 @@
releaseHttpServer();
super.tearDown();
}
-
+/* disable the whole tests until someone could fix it.
public void test_S0P0() throws Throwable {
doPlayStreams(0, 0);
}
@@ -91,7 +91,7 @@
public void test_S6P00002() throws Throwable {
doPlayStreams(6, 0.00002f);
}
-
+*/
private void doPlayStreams(int seed, float probability) throws Throwable {
Random random = new Random(seed);
createHttpServer(seed, probability);
diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
index b8ccf22..5b943ca 100644
--- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
@@ -25,6 +25,8 @@
public class StreamingMediaPlayerTest extends MediaPlayerTestBase {
private CtsTestServer mServer;
+/* RTSP tests are more flaky and vulnerable to network condition.
+ Disable until better solution is available
// Streaming RTSP video from YouTube
public void testRTSP_H263_AMR_Video1() throws Exception {
playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0x271de9756065677e"
@@ -52,7 +54,7 @@
playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0xc80658495af60617"
+ "&fmt=18&user=android-device-test", 480, 270);
}
-
+*/
// Streaming HTTP video from YouTube
public void testHTTP_H263_AMR_Video1() throws Exception {
playVideoTest("http://v20.lscache8.c.youtube.com/videoplayback?id=271de9756065677e"
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/provider/src/android/provider/cts/Settings_SecureTest.java b/tests/tests/provider/src/android/provider/cts/Settings_SecureTest.java
index 2a12243..6e3f4e6 100644
--- a/tests/tests/provider/src/android/provider/cts/Settings_SecureTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Settings_SecureTest.java
@@ -32,7 +32,7 @@
* Setting that will have a string value to trigger SettingNotFoundException caused by
* NumberFormatExceptions for getInt, getFloat, and getLong.
*/
- private static final String STRING_VALUE_SETTING = Secure.ENABLED_ACCESSIBILITY_SERVICES;
+ private static final String STRING_VALUE_SETTING = Secure.ANDROID_ID;
private ContentResolver cr;
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);