From 267d4164a9e68a1065ea8e5a5da40a57dde76e2a Mon Sep 17 00:00:00 2001 From: rohks Date: Tue, 1 Aug 2023 11:21:33 +0100 Subject: [PATCH] Fix wrong documentation and add missing annotations #minor-release PiperOrigin-RevId: 552749407 --- .../media3/exoplayer/upstream/CmcdConfiguration.java | 2 +- .../java/androidx/media3/exoplayer/upstream/CmcdLog.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java index a16f06dd44..c1c50f9087 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java @@ -285,7 +285,7 @@ public final class CmcdConfiguration { } /** - * Returns whether logging object duration is allowed based on the {@linkplain RequestConfig + * Returns whether logging measured throughput is allowed based on the {@linkplain RequestConfig * request configuration}. */ public boolean isMeasuredThroughputLoggingAllowed() { diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java index 9f99bb8ae8..eef715f0fa 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java @@ -444,8 +444,8 @@ public final class CmcdLog { public static final class Builder { @Nullable private String contentId; @Nullable private String sessionId; - @Nullable private String streamingFormat; - @Nullable private String streamType; + @Nullable private @StreamingFormat String streamingFormat; + @Nullable private @StreamType String streamType; @Nullable private String customData; /** @@ -530,13 +530,13 @@ public final class CmcdLog { * (HLS), s = Smooth Streaming and o = other. If the streaming format being requested is * unknown, then this key MUST NOT be used. */ - @Nullable public final String streamingFormat; + @Nullable public final @StreamingFormat String streamingFormat; /** * Type of stream. v = all segments are available – e.g., VOD and l = segments become available * over time – e.g., LIVE. */ - @Nullable public final String streamType; + @Nullable public final @StreamType String streamType; /** * Custom data where the values of the keys are expected to be invariant over the life of the