loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ImmutableMap.Builder.buildOrThrow() instead of deprecated build().

Browse Source 
More info: ​go/immutable-map-buildorthrow-lsc

NOTE: if the source of truth for this code is *NOT* `third_party`, please let me know and I'll revert this CL (and please consider upstreaming this change yourself).

#inlineme

Tested:
    TAP for global presubmit queue passed after automated deflaking of failures: http://mondo/deflaker/run/530857d2-45cb-4069-a234-48c5efe945f1 http://mondo/deflaker/run/0dce4296-e6bb-42d2-8b64-b393f45b6ad3
    http://test/OCL:425453729:BASE:425451020:1643699365244:811c1a24
PiperOrigin-RevId: 425616165
This commit is contained in:
olly 2022-02-01 15:12:48 +00:00 committed by Andrew Lewis
parent c5b7e7b258
commit cb81b04dab
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java
View File

@ -300,7 +300,7 @@ public final class TrackSelectionOverrides implements Bundleable {
TrackSelectionOverride trackSelectionOverride = trackSelectionOverrides.get(i); TrackSelectionOverride trackSelectionOverride = trackSelectionOverrides.get(i);
builder.put(trackSelectionOverride.trackGroup, trackSelectionOverride); builder.put(trackSelectionOverride.trackGroup, trackSelectionOverride);
} }
return new TrackSelectionOverrides(builder.build()); return new TrackSelectionOverrides(builder.buildOrThrow());
}; };
private static String keyForField(@FieldNumber int field) { private static String keyForField(@FieldNumber int field) {

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java
View File

@ -1122,7 +1122,7 @@ public class AnalyticsCollector
addTimelineForMediaPeriodId(builder, currentPlayerMediaPeriod, preferredTimeline); addTimelineForMediaPeriodId(builder, currentPlayerMediaPeriod, preferredTimeline);
} }
} }
mediaPeriodTimelines = builder.build(); mediaPeriodTimelines = builder.buildOrThrow();
} }
private void addTimelineForMediaPeriodId( private void addTimelineForMediaPeriodId(

2
libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java
View File

@ -324,6 +324,6 @@ import java.util.HashMap;
String[] parameterPair = Util.splitAtFirst(parameter, "="); String[] parameterPair = Util.splitAtFirst(parameter, "=");
formatParametersBuilder.put(parameterPair[0], parameterPair[1]); formatParametersBuilder.put(parameterPair[0], parameterPair[1]);
} }
return formatParametersBuilder.build(); return formatParametersBuilder.buildOrThrow();
} }
} }

2
libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java
View File

@ -161,7 +161,7 @@ public class RtspMediaTrackTest {
.put("indexlength", "3") .put("indexlength", "3")
.put("indexdeltalength", "3") .put("indexdeltalength", "3")
.put("config", "1208") .put("config", "1208")
.build()); .buildOrThrow());
assertThat(format).isEqualTo(expectedFormat); assertThat(format).isEqualTo(expectedFormat);
} }

2
libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java
View File

@ -554,7 +554,7 @@ public final class FakeExoMediaDrm implements ExoMediaDrm {
optionalParameters.put(optionalParameterKeys.get(i), optionalParameterValues.get(i)); optionalParameters.put(optionalParameterKeys.get(i), optionalParameterValues.get(i));
} }
this.optionalParameters = optionalParameters.build(); this.optionalParameters = optionalParameters.buildOrThrow();
} }
public byte[] toByteArray() { public byte[] toByteArray() {

4
libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java
View File

@ -406,7 +406,7 @@ public class WebServerDispatcher extends Dispatcher {
@Nullable String qvalue = matcher.group(2); @Nullable String qvalue = matcher.group(2);
parsedEncodings.put(contentCoding, qvalue == null ? -1f : Float.parseFloat(qvalue)); parsedEncodings.put(contentCoding, qvalue == null ? -1f : Float.parseFloat(qvalue));
} }
return parsedEncodings.build(); return parsedEncodings.buildOrThrow();
} }
/** /**
@ -432,7 +432,7 @@ public class WebServerDispatcher extends Dispatcher {
ImmutableMap.<String, Float>builder() ImmutableMap.<String, Float>builder()
.putAll(acceptEncodingHeader) .putAll(acceptEncodingHeader)
.put("identity", -1f) .put("identity", -1f)
.build(); .buildOrThrow();
} }
float asteriskQvalue = acceptEncodingHeader.getOrDefault("*", 0f); float asteriskQvalue = acceptEncodingHeader.getOrDefault("*", 0f);
@Nullable String preferredContentCoding = null; @Nullable String preferredContentCoding = null;