diff options
| author | 2024-07-30 22:55:07 +0000 | |
|---|---|---|
| committer | 2024-07-30 22:55:07 +0000 | |
| commit | 421f3f0556da515720a9e729e96e2d36a683500e (patch) | |
| tree | 736a547263195afab61402e69820e8bbc14c3113 | |
| parent | 4e007ae8c5098638a87c0047a9104f49a1c4a886 (diff) | |
| parent | 55a0198cd3b1c054e03781623038075f06a82657 (diff) | |
Merge "Ravenwood: Support LocaleList" into main
| -rw-r--r-- | core/java/android/os/LocaleList.java | 1 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/os/LocaleListTest.java | 2 | ||||
| -rw-r--r-- | ravenwood/texts/ravenwood-annotation-allowed-classes.txt | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/LocaleList.java b/core/java/android/os/LocaleList.java index d7e440b66e13..c152c2d1abd4 100644 --- a/core/java/android/os/LocaleList.java +++ b/core/java/android/os/LocaleList.java @@ -37,6 +37,7 @@ import java.util.Locale; * LocaleList is an immutable list of Locales, typically used to keep an ordered list of user * preferences for locales. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class LocaleList implements Parcelable { private final Locale[] mList; // This is a comma-separated list of the locales in the LocaleList created at construction time, diff --git a/core/tests/coretests/src/android/os/LocaleListTest.java b/core/tests/coretests/src/android/os/LocaleListTest.java index 251e00fb68f2..0b8aff0c5d88 100644 --- a/core/tests/coretests/src/android/os/LocaleListTest.java +++ b/core/tests/coretests/src/android/os/LocaleListTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; -import android.platform.test.annotations.IgnoreUnderRavenwood; import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -33,7 +32,6 @@ import org.junit.runner.RunWith; import java.util.Locale; @RunWith(AndroidJUnit4.class) -@IgnoreUnderRavenwood(blockedBy = LocaleList.class) public class LocaleListTest { @Rule public final RavenwoodRule mRavenwood = new RavenwoodRule(); diff --git a/ravenwood/texts/ravenwood-annotation-allowed-classes.txt b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt index bdc357789191..68f185eba42c 100644 --- a/ravenwood/texts/ravenwood-annotation-allowed-classes.txt +++ b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt @@ -143,6 +143,7 @@ android.os.Handler android.os.HandlerExecutor android.os.HandlerThread android.os.IBinder +android.os.LocaleList android.os.Looper android.os.Message android.os.MessageQueue |