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

Merge "RouteDiscoveryPreference: Filter out null/empty values" into rvc-dev

Browse Source
This commit is contained in:
Hyundo Moon
2020-04-02 07:15:18 +00:00
committed by Android (Google) Code Review
parent 137af5ad16 6d05ce4242
commit dbbb846b8c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/java/android/media/RouteDiscoveryPreference.java
View File

@@ -21,6 +21,7 @@ import android.annotation.Nullable;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -29,6 +30,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
/** /**
* A media route discovery preference describing the features of routes that media router * A media route discovery preference describing the features of routes that media router
@@ -169,8 +171,9 @@ public final class RouteDiscoveryPreference implements Parcelable {
Bundle mExtras; Bundle mExtras;
public Builder(@NonNull List<String> preferredFeatures, boolean activeScan) { public Builder(@NonNull List<String> preferredFeatures, boolean activeScan) {
mPreferredFeatures = new ArrayList<>(Objects.requireNonNull(preferredFeatures, Objects.requireNonNull(preferredFeatures, "preferredFeatures must not be null");
"preferredFeatures must not be null")); mPreferredFeatures = preferredFeatures.stream().filter(str -> !TextUtils.isEmpty(str))
.collect(Collectors.toList());
mActiveScan = activeScan; mActiveScan = activeScan;
} }
@@ -211,8 +214,9 @@ public final class RouteDiscoveryPreference implements Parcelable {
*/ */
@NonNull @NonNull
public Builder setPreferredFeatures(@NonNull List<String> preferredFeatures) { public Builder setPreferredFeatures(@NonNull List<String> preferredFeatures) {
mPreferredFeatures = new ArrayList<>(Objects.requireNonNull(preferredFeatures, Objects.requireNonNull(preferredFeatures, "preferredFeatures must not be null");
"preferredFeatures must not be null")); mPreferredFeatures = preferredFeatures.stream().filter(str -> !TextUtils.isEmpty(str))
.collect(Collectors.toList());
return this; return this;
} }