commit 2f5aca2bb8452e647bcd1f01454c6082b4a498f3
author Nick Kralevich <nnk@google.com> Mon Apr 23 09:19:07 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Apr 23 09:19:08 2012 -0700
tree cd6c8033e6976af03b9ed3a4efd63066fcc9263f
parent 86d42b69958f22ccb09b203b8428be72153e6e96
parent 8f54ce571e5794f2c84c0c4e095fed1444d8c21a

Merge "FileSystemPermissionTest: add /data/data/recovery/HTCFOTA add /data/data/recovery/OMADM"

tests/tests/graphics/src/android/graphics/cts/PaintTest.java

diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index 169fb56..6d72283 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -34,6 +34,7 @@
 import android.graphics.Shader;
 import android.graphics.Typeface;
 import android.graphics.Xfermode;
+import android.os.Build;
 import android.test.AndroidTestCase;
 import android.text.SpannedString;
 
@@ -1248,6 +1249,11 @@
     }
 
     public void testMeasureTextWithLongText() {
+        // This test is not compatible with 4.0.3
+        if ("4.0.3".equals(Build.VERSION.RELEASE)) {
+            return;
+        }
+
         final int MAX_COUNT = 65535;
         char[] longText = new char[MAX_COUNT];
         for (int n = 0; n < MAX_COUNT; n++) {

tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java

diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 05e668b..2af4482 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -215,6 +215,11 @@
         )
     })
     public void testAccessAllowFileAccess() {
+        // This test is not compatible with 4.0.3
+        if ("4.0.3".equals(Build.VERSION.RELEASE)) {
+            return;
+        }
+
         assertTrue(mSettings.getAllowFileAccess());
 
         String fileUrl = TestHtmlConstants.getFileUrl(TestHtmlConstants.HELLO_WORLD_URL);