Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a72a6879 authored by Dan Bornstein's avatar Dan Bornstein Committed by The Android Open Source Project
Browse files

Merge branch 'readonly-p4-donut' into donut

parents b81ff457 6d20e257

tests/CoreTests/android/core/LocaleTest.java

+3 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import java.util.TimeZone; 
import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.Suppress;



/**

 * Test some locale-dependent stuff for Android. This test mainly ensures that
@@ -126,9 +125,9 @@ public class LocaleTest extends TestCase { 
    }

    */



    // This one makes sure we have all necessary locales installed.

    // Suppress this flaky test for now.

    @Suppress

    // Regression test for 1118570: Create test cases for tracking ICU config

    // changes. This one makes sure we have all necessary locales installed.

    @MediumTest

    public void testICULocales() {

        String[] locales = new String[] {

                // List of locales currently required for Android.