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

Commit 421f3f05 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Ravenwood: Support LocaleList" into main

parents 4e007ae8 55a0198c

core/java/android/os/LocaleList.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ import java.util.Locale; 
 * LocaleList is an immutable list of Locales, typically used to keep an ordered list of user

 * LocaleList is an immutable list of Locales, typically used to keep an ordered list of user

 * preferences for locales.

 * preferences for locales.

 */

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public final class LocaleList implements Parcelable {

public final class LocaleList implements Parcelable {

    private final Locale[] mList;

    private final Locale[] mList;

    // This is a comma-separated list of the locales in the LocaleList created at construction time,

    // This is a comma-separated list of the locales in the LocaleList created at construction time,

core/tests/coretests/src/android/os/LocaleListTest.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertSame;

import static org.junit.Assert.assertSame;

import static org.junit.Assert.fail;

import static org.junit.Assert.fail;





import android.platform.test.annotations.IgnoreUnderRavenwood;

import android.platform.test.ravenwood.RavenwoodRule;

import android.platform.test.ravenwood.RavenwoodRule;





import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -33,7 +32,6 @@ import org.junit.runner.RunWith; 
import java.util.Locale;

import java.util.Locale;





@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@IgnoreUnderRavenwood(blockedBy = LocaleList.class)

public class LocaleListTest {

public class LocaleListTest {

    @Rule

    @Rule

    public final RavenwoodRule mRavenwood = new RavenwoodRule();

    public final RavenwoodRule mRavenwood = new RavenwoodRule();

ravenwood/texts/ravenwood-annotation-allowed-classes.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -143,6 +143,7 @@ android.os.Handler 
android.os.HandlerExecutor

android.os.HandlerExecutor

android.os.HandlerThread

android.os.HandlerThread

android.os.IBinder

android.os.IBinder

android.os.LocaleList

android.os.Looper

android.os.Looper

android.os.Message

android.os.Message

android.os.MessageQueue

android.os.MessageQueue