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

Commit 4b76f842 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Decouple Content Name Locale from Content Language Locale" am: a830e830 

am: 768b6c5e

Change-Id: Ibb2d70b40c0a439ad37deb911eb6b08ccde4bbfe
parents a17b99f7 768b6c5e

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40551,6 +40551,7 @@ package android.telephony.mbms { 
  public class ServiceInfo {

  public class ServiceInfo {

    method public java.util.List<java.util.Locale> getLocales();

    method public java.util.List<java.util.Locale> getLocales();

    method public java.lang.CharSequence getNameForLocale(java.util.Locale);

    method public java.lang.CharSequence getNameForLocale(java.util.Locale);

    method public java.util.Set<java.util.Locale> getNamedContentLocales();

    method public java.lang.String getServiceClassName();

    method public java.lang.String getServiceClassName();

    method public java.lang.String getServiceId();

    method public java.lang.String getServiceId();

    method public java.util.Date getSessionEndTime();

    method public java.util.Date getSessionEndTime();

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -44080,6 +44080,7 @@ package android.telephony.mbms { 
  public class ServiceInfo {

  public class ServiceInfo {

    method public java.util.List<java.util.Locale> getLocales();

    method public java.util.List<java.util.Locale> getLocales();

    method public java.lang.CharSequence getNameForLocale(java.util.Locale);

    method public java.lang.CharSequence getNameForLocale(java.util.Locale);

    method public java.util.Set<java.util.Locale> getNamedContentLocales();

    method public java.lang.String getServiceClassName();

    method public java.lang.String getServiceClassName();

    method public java.lang.String getServiceId();

    method public java.lang.String getServiceId();

    method public java.util.Date getSessionEndTime();

    method public java.util.Date getSessionEndTime();

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40775,6 +40775,7 @@ package android.telephony.mbms { 
  public class ServiceInfo {

  public class ServiceInfo {

    method public java.util.List<java.util.Locale> getLocales();

    method public java.util.List<java.util.Locale> getLocales();

    method public java.lang.CharSequence getNameForLocale(java.util.Locale);

    method public java.lang.CharSequence getNameForLocale(java.util.Locale);

    method public java.util.Set<java.util.Locale> getNamedContentLocales();

    method public java.lang.String getServiceClassName();

    method public java.lang.String getServiceClassName();

    method public java.lang.String getServiceId();

    method public java.lang.String getServiceId();

    method public java.util.Date getSessionEndTime();

    method public java.util.Date getSessionEndTime();

telephony/java/android/telephony/mbms/ServiceInfo.java

+13 −7
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Parcelable; 
import android.text.TextUtils;

import android.text.TextUtils;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Date;

import java.util.Date;

import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;
@@ -62,12 +63,6 @@ public class ServiceInfo { 
            throw new RuntimeException("bad locales length " + newLocales.size());

            throw new RuntimeException("bad locales length " + newLocales.size());

        }

        }





        for (Locale l : newLocales) {

            if (!newNames.containsKey(l)) {

                throw new IllegalArgumentException("A name must be provided for each locale");

            }

        }



        names = new HashMap(newNames.size());

        names = new HashMap(newNames.size());

        names.putAll(newNames);

        names.putAll(newNames);

        className = newClassName;

        className = newClassName;
@@ -127,7 +122,7 @@ public class ServiceInfo { 
     * Get the user-displayable name for this cell-broadcast service corresponding to the

     * Get the user-displayable name for this cell-broadcast service corresponding to the

     * provided {@link Locale}.

     * provided {@link Locale}.

     * @param locale The {@link Locale} in which you want the name of the service. This must be a

     * @param locale The {@link Locale} in which you want the name of the service. This must be a

     *               value from the list returned by {@link #getLocales()} -- an

     *               value from the set returned by {@link #getNamedContentLocales()} -- an

     *               {@link java.util.NoSuchElementException} may be thrown otherwise.

     *               {@link java.util.NoSuchElementException} may be thrown otherwise.

     * @return The {@link CharSequence} providing the name of the service in the given

     * @return The {@link CharSequence} providing the name of the service in the given

     *         {@link Locale}

     *         {@link Locale}
@@ -139,6 +134,17 @@ public class ServiceInfo { 
        return names.get(locale);

        return names.get(locale);

    }

    }





    /**

     * Return an unmodifiable set of the current {@link Locale}s that have a user-displayable name

     * associated with them. The user-displayable name associated with any {@link Locale} in this

     * set can be retrieved with {@link #getNameForLocale(Locale)}.

     * @return An unmodifiable set of {@link Locale} objects corresponding to a user-displayable

     * content name in that locale.

     */

    public @NonNull Set<Locale> getNamedContentLocales() {

        return Collections.unmodifiableSet(names.keySet());

    }



    /**

    /**

     * The class name for this service - used to categorize and filter

     * The class name for this service - used to categorize and filter

     */

     */