From 52f378834db985b308677e783933d92d5d0658ca Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 16 Apr 2019 13:30:38 -0700
Subject: [PATCH] Make LocaleList.isPseudoLocale a public API

Test: CTS
Bug: 130636934
Change-Id: I6a9abd8a7de358cb077d9648c62fe9c0ec482720
---
 api/current.txt                      | 1 +
 api/system-current.txt               | 4 ----
 core/java/android/os/LocaleList.java | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 8ec7594773af2..700d41fb1195a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34594,6 +34594,7 @@ package android.os {
     method @Nullable public java.util.Locale getFirstMatch(String[]);
     method @IntRange(from=0xffffffff) public int indexOf(java.util.Locale);
     method public boolean isEmpty();
+    method public static boolean isPseudoLocale(@Nullable android.icu.util.ULocale);
     method public static void setDefault(@NonNull @Size(min=1) android.os.LocaleList);
     method @IntRange(from=0) public int size();
     method @NonNull public String toLanguageTags();
diff --git a/api/system-current.txt b/api/system-current.txt
index 209fca77a8ba6..217cc9d577e09 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5370,10 +5370,6 @@ package android.os {
     field @NonNull public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR;
   }
 
-  public final class LocaleList implements android.os.Parcelable {
-    method public static boolean isPseudoLocale(@Nullable android.icu.util.ULocale);
-  }
-
   public final class NativeHandle implements java.io.Closeable {
     ctor public NativeHandle();
     ctor public NativeHandle(@NonNull java.io.FileDescriptor, boolean);
diff --git a/core/java/android/os/LocaleList.java b/core/java/android/os/LocaleList.java
index 351df1bf23e03..011810b6de489 100644
--- a/core/java/android/os/LocaleList.java
+++ b/core/java/android/os/LocaleList.java
@@ -20,7 +20,6 @@ import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.Size;
-import android.annotation.SystemApi;
 import android.annotation.UnsupportedAppUsage;
 import android.content.LocaleProto;
 import android.icu.util.ULocale;
@@ -328,9 +327,7 @@ public final class LocaleList implements Parcelable {
 
     /**
      * Returns true if locale is a pseudo-locale, false otherwise.
-     * {@hide}
      */
-    @SystemApi
     public static boolean isPseudoLocale(@Nullable ULocale locale) {
         return isPseudoLocale(locale != null ? locale.toLocale() : null);
     }