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 am: dbbb846b8c am: 9f35679ff8 am: 0c2d6be7f0

Browse Source 
Change-Id: I227a33c59251db2c5059da5e228b5c6d331b0e12
This commit is contained in:
Hyundo Moon
2020-04-02 08:44:51 +00:00
committed by Automerger Merge Worker
parent f55a04004c 0c2d6be7f0
commit 3d757a7a8e
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.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,6 +30,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 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;
public Builder(@NonNull List<String> preferredFeatures, boolean activeScan) {
mPreferredFeatures = new ArrayList<>(Objects.requireNonNull(preferredFeatures,
"preferredFeatures must not be null"));
Objects.requireNonNull(preferredFeatures, "preferredFeatures must not be null");
mPreferredFeatures = preferredFeatures.stream().filter(str -> !TextUtils.isEmpty(str))
.collect(Collectors.toList());
mActiveScan = activeScan;
}
@@ -211,8 +214,9 @@ public final class RouteDiscoveryPreference implements Parcelable {
*/
@NonNull
public Builder setPreferredFeatures(@NonNull List<String> preferredFeatures) {
mPreferredFeatures = new ArrayList<>(Objects.requireNonNull(preferredFeatures,
"preferredFeatures must not be null"));
Objects.requireNonNull(preferredFeatures, "preferredFeatures must not be null");
mPreferredFeatures = preferredFeatures.stream().filter(str -> !TextUtils.isEmpty(str))
.collect(Collectors.toList());
return this;
}