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

Merge "Fix for android.hardware.radio.Utils.createIntSet"

Browse Source 
am: b25190cf62

Change-Id: Ia7b2e2fb683c3a8a0ad00594ce69eea7cad705b3
This commit is contained in:
Jan Kowal
2018-10-23 15:35:50 -07:00
committed by android-build-merger
parent 0cce6d2bf4 b25190cf62
commit e01a3fd480
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/hardware/radio/Utils.java
View File

@@ -47,7 +47,7 @@ final class Utils {
static @NonNull Map<String, String> readStringMap(@NonNull Parcel in) { static @NonNull Map<String, String> readStringMap(@NonNull Parcel in) {
int size = in.readInt(); int size = in.readInt();
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>(size);
while (size-- > 0) { while (size-- > 0) {
String key = in.readString(); String key = in.readString();
String value = in.readString(); String value = in.readString();
@@ -70,7 +70,7 @@ final class Utils {
static @NonNull Map<String, Integer> readStringIntMap(@NonNull Parcel in) { static @NonNull Map<String, Integer> readStringIntMap(@NonNull Parcel in) {
int size = in.readInt(); int size = in.readInt();
Map<String, Integer> map = new HashMap<>(); Map<String, Integer> map = new HashMap<>(size);
while (size-- > 0) { while (size-- > 0) {
String key = in.readString(); String key = in.readString();
int value = in.readInt(); int value = in.readInt();
@@ -90,7 +90,7 @@ final class Utils {
static <T> Set<T> createSet(@NonNull Parcel in, Parcelable.Creator<T> c) { static <T> Set<T> createSet(@NonNull Parcel in, Parcelable.Creator<T> c) {
int size = in.readInt(); int size = in.readInt();
Set<T> set = new HashSet<>(); Set<T> set = new HashSet<>(size);
while (size-- > 0) { while (size-- > 0) {
set.add(in.readTypedObject(c)); set.add(in.readTypedObject(c));
} }
@@ -107,15 +107,12 @@ final class Utils {
} }
static Set<Integer> createIntSet(@NonNull Parcel in) { static Set<Integer> createIntSet(@NonNull Parcel in) {
return createSet(in, new Parcelable.Creator<Integer>() { int size = in.readInt();
public Integer createFromParcel(Parcel in) { Set<Integer> set = new HashSet<>(size);
return in.readInt(); while (size-- > 0) {
} set.add(in.readInt());
}
public Integer[] newArray(int size) { return set;
return new Integer[size];
}
});
} }
static <T extends Parcelable> void writeTypedCollection(@NonNull Parcel dest, static <T extends Parcelable> void writeTypedCollection(@NonNull Parcel dest,