Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed Locale in ServiceInfo to a list."

Browse Source
This commit is contained in:
Robert Greenwalt
2017-06-10 00:03:56 +00:00
committed by Gerrit Code Review
parent 186a588d57 47c2a3e93e
commit a1df5b25e6
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/mbms/FileServiceInfo.java
View File

@@ -32,9 +32,10 @@ import java.util.Map;
public class FileServiceInfo extends ServiceInfo implements Parcelable { public class FileServiceInfo extends ServiceInfo implements Parcelable {
public List<FileInfo> files; public List<FileInfo> files;
public FileServiceInfo(Map<Locale, String> newNames, String newClassName, Locale newLocale, public FileServiceInfo(Map<Locale, String> newNames, String newClassName,
String newServiceId, Date start, Date end, List<FileInfo> newFiles) { List<Locale> newLocales, String newServiceId, Date start, Date end,
super(newNames, newClassName, newLocale, newServiceId, start, end); List<FileInfo> newFiles) {
super(newNames, newClassName, newLocales, newServiceId, start, end);
files = new ArrayList(newFiles); files = new ArrayList(newFiles);
} }

39
telephony/java/android/telephony/mbms/ServiceInfo.java
View File

@@ -20,8 +20,10 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -44,9 +46,9 @@ public class ServiceInfo implements Parcelable {
final String className; final String className;
/** /**
* The language for this service content * The languages available for this service content
*/ */
final Locale locale; final List<Locale> locales;
/** /**
* The carrier's identifier for the service. * The carrier's identifier for the service.
@@ -64,20 +66,23 @@ public class ServiceInfo implements Parcelable {
final Date sessionEndTime; final Date sessionEndTime;
public ServiceInfo(Map<Locale, String> newNames, String newClassName, Locale newLocale, public ServiceInfo(Map<Locale, String> newNames, String newClassName, List<Locale> newLocales,
String newServiceId, Date start, Date end) { String newServiceId, Date start, Date end) {
if (newNames == null || newNames.isEmpty() || TextUtils.isEmpty(newClassName) if (newNames == null || newNames.isEmpty() || TextUtils.isEmpty(newClassName)
|| newLocale == null || TextUtils.isEmpty(newServiceId) || newLocales == null || newLocales.isEmpty() || TextUtils.isEmpty(newServiceId)
|| start == null || end == null) { || start == null || end == null) {
throw new IllegalArgumentException("Bad ServiceInfo construction"); throw new IllegalArgumentException("Bad ServiceInfo construction");
} }
if (newNames.size() > MAP_LIMIT) { if (newNames.size() > MAP_LIMIT) {
throw new RuntimeException("bad map length" + newNames.size()); throw new RuntimeException("bad map length " + newNames.size());
}
if (newLocales.size() > MAP_LIMIT) {
throw new RuntimeException("bad locales length " + newLocales.size());
} }
names = new HashMap(newNames.size()); names = new HashMap(newNames.size());
names.putAll(newNames); names.putAll(newNames);
className = newClassName; className = newClassName;
locale = (Locale)newLocale.clone(); locales = new ArrayList(newLocales);
serviceId = newServiceId; serviceId = newServiceId;
sessionStartTime = (Date)start.clone(); sessionStartTime = (Date)start.clone();
sessionEndTime = (Date)end.clone(); sessionEndTime = (Date)end.clone();
@@ -99,7 +104,7 @@ public class ServiceInfo implements Parcelable {
ServiceInfo(Parcel in) { ServiceInfo(Parcel in) {
int mapCount = in.readInt(); int mapCount = in.readInt();
if (mapCount > MAP_LIMIT || mapCount < 0) { if (mapCount > MAP_LIMIT || mapCount < 0) {
throw new RuntimeException("bad map length" + mapCount); throw new RuntimeException("bad map length" + mapCount);
} }
names = new HashMap(mapCount); names = new HashMap(mapCount);
while (mapCount-- > 0) { while (mapCount-- > 0) {
@@ -108,7 +113,15 @@ public class ServiceInfo implements Parcelable {
names.put(locale, name); names.put(locale, name);
} }
className = in.readString(); className = in.readString();
locale = (java.util.Locale) in.readSerializable(); int localesCount = in.readInt();
if (localesCount > MAP_LIMIT || localesCount < 0) {
throw new RuntimeException("bad locale length " + localesCount);
}
locales = new ArrayList<Locale>(localesCount);
while (localesCount-- > 0) {
Locale l = (java.util.Locale) in.readSerializable();
locales.add(l);
}
serviceId = in.readString(); serviceId = in.readString();
sessionStartTime = (java.util.Date) in.readSerializable(); sessionStartTime = (java.util.Date) in.readSerializable();
sessionEndTime = (java.util.Date) in.readSerializable(); sessionEndTime = (java.util.Date) in.readSerializable();
@@ -123,7 +136,11 @@ public class ServiceInfo implements Parcelable {
dest.writeString(names.get(l)); dest.writeString(names.get(l));
} }
dest.writeString(className); dest.writeString(className);
dest.writeSerializable(locale); int localesCount = locales.size();
dest.writeInt(localesCount);
for (Locale l : locales) {
dest.writeSerializable(l);
}
dest.writeString(serviceId); dest.writeString(serviceId);
dest.writeSerializable(sessionStartTime); dest.writeSerializable(sessionStartTime);
dest.writeSerializable(sessionEndTime); dest.writeSerializable(sessionEndTime);
@@ -142,8 +159,8 @@ public class ServiceInfo implements Parcelable {
return className; return className;
} }
public Locale getLocale() { public List<Locale> getLocales() {
return locale; return locales;
} }
public String getServiceId() { public String getServiceId() {

5
telephony/java/android/telephony/mbms/StreamingServiceInfo.java
View File

@@ -20,6 +20,7 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@@ -31,8 +32,8 @@ import java.util.Map;
public class StreamingServiceInfo extends ServiceInfo implements Parcelable { public class StreamingServiceInfo extends ServiceInfo implements Parcelable {
public StreamingServiceInfo(Map<Locale, String> newNames, String newClassName, public StreamingServiceInfo(Map<Locale, String> newNames, String newClassName,
Locale newLocale, String newServiceId, Date start, Date end) { List<Locale> newLocales, String newServiceId, Date start, Date end) {
super(newNames, newClassName, newLocale, newServiceId, start, end); super(newNames, newClassName, newLocales, newServiceId, start, end);
} }
public static final Parcelable.Creator<StreamingServiceInfo> CREATOR = public static final Parcelable.Creator<StreamingServiceInfo> CREATOR =