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

Commit 9d817300 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I8e3f0fde0a0a2bbe9027ea00541c41cccbb512ed
parents 2d7d8c26 00ec7767

core/java/android/os/LocaleList.java

+6 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.icu.util.ULocale; 


import com.android.internal.annotations.GuardedBy;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.HashSet;
@@ -150,18 +151,18 @@ public final class LocaleList implements Parcelable { 
    /**

     * Creates a new {@link LocaleList}.

     *

     * If two or more same locales are passed, the repeated locales will be dropped.

     * <p>For empty lists of {@link Locale} items it is better to use {@link #getEmptyLocaleList()},

     * which returns a pre-constructed empty list.</p>

     *

     * @throws NullPointerException if any of the input locales is <code>null</code>.

     * @throws IllegalArgumentException if any of the input locales repeat.

     */

    public LocaleList(@NonNull Locale... list) {

        if (list.length == 0) {

            mList = sEmptyList;

            mStringRepresentation = "";

        } else {

            final Locale[] localeList = new Locale[list.length];

            final ArrayList<Locale> localeList = new ArrayList<>();

            final HashSet<Locale> seenLocales = new HashSet<Locale>();

            final StringBuilder sb = new StringBuilder();

            for (int i = 0; i < list.length; i++) {
@@ -169,10 +170,10 @@ public final class LocaleList implements Parcelable { 
                if (l == null) {

                    throw new NullPointerException("list[" + i + "] is null");

                } else if (seenLocales.contains(l)) {

                    throw new IllegalArgumentException("list[" + i + "] is a repetition");

                    // Dropping duplicated locale entries.

                } else {

                    final Locale localeClone = (Locale) l.clone();

                    localeList[i] = localeClone;

                    localeList.add(localeClone);

                    sb.append(localeClone.toLanguageTag());

                    if (i < list.length - 1) {

                        sb.append(',');
@@ -180,7 +181,7 @@ public final class LocaleList implements Parcelable { 
                    seenLocales.add(localeClone);

                }

            }

            mList = localeList;

            mList = localeList.toArray(new Locale[localeList.size()]);

            mStringRepresentation = sb.toString();

        }

    }