release-request-7d12f16b-b4a7-4324-8b59-be2d4e07dcb3-for-git_oc-release-4094438 snap-temp-L80000000073561277android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-release

Change-Id: Iafa272ba71022c59423ae2dbb251dda70d995da1

4 files changed, 16 insertions, 0 deletions

diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/format/NumberRegressionTests.java b/android_icu4j/src/main/tests/android/icu/dev/test/format/NumberRegressionTests.java
index d566af976..b235ea151 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/format/NumberRegressionTests.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/format/NumberRegressionTests.java
@@ -40,6 +40,7 @@ import java.text.ParsePosition;
 import java.util.Date;
 import java.util.Locale;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import android.icu.dev.test.TestFmwk;
@@ -1529,6 +1530,9 @@ public class NumberRegressionTests extends TestFmwk {
      * symbol, percent, and permille.  This is filed as bugs 4212072 and
      * 4212073.
      */
+    // Android-changed: Added @Ignore to suppress the test; it consumes a lot of heap, permanently,
+    // affecting later tests. http://b/62374714
+    @Ignore
     @Test
     public void Test4212072() throws IOException, ClassNotFoundException {
         DecimalFormatSymbols sym = new DecimalFormatSymbols(Locale.US);
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeUnitTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeUnitTest.java
index 1e9e4264a..86ae66739 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeUnitTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeUnitTest.java
@@ -13,6 +13,7 @@ import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Locale;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import android.icu.dev.test.TestFmwk;
@@ -281,6 +282,9 @@ public class TimeUnitTest extends TestFmwk {
         tuf.setNumberFormat(numfmt);        
     }
 
+    // Android-changed: Added @Ignore to suppress the test; it consumes a lot of heap, permanently,
+    // affecting later tests. http://b/62374714
+    @Ignore
     @Test
     public void TestBritishShortHourFallback() {
         // See ticket #11986 "incomplete fallback in MeasureFormat".
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberRegressionTests.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberRegressionTests.java
index c97cd1204..7aca65a19 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberRegressionTests.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberRegressionTests.java
@@ -39,6 +39,7 @@ import java.text.ParsePosition;
 import java.util.Date;
 import java.util.Locale;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.ibm.icu.dev.test.TestFmwk;
@@ -1528,6 +1529,9 @@ public class NumberRegressionTests extends TestFmwk {
      * symbol, percent, and permille.  This is filed as bugs 4212072 and
      * 4212073.
      */
+    // Android-changed: Added @Ignore to suppress the test; it consumes a lot of heap, permanently,
+    // affecting later tests. http://b/62374714
+    @Ignore
     @Test
     public void Test4212072() throws IOException, ClassNotFoundException {
         DecimalFormatSymbols sym = new DecimalFormatSymbols(Locale.US);
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeUnitTest.java
index ff3490885..750a28f48 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeUnitTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeUnitTest.java
@@ -12,6 +12,7 @@ import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Locale;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.ibm.icu.dev.test.TestFmwk;
@@ -280,6 +281,9 @@ public class TimeUnitTest extends TestFmwk {
         tuf.setNumberFormat(numfmt);        
     }
 
+    // Android-changed: Added @Ignore to suppress the test; it consumes a lot of heap, permanently,
+    // affecting later tests. http://b/62374714
+    @Ignore
     @Test
     public void TestBritishShortHourFallback() {
         // See ticket #11986 "incomplete fallback in MeasureFormat".