Fixed spelling across various PlayerInfo *ChangeReason fields

PiperOrigin-RevId: 541892788
SimonHung · Jun 22, 2023 · b9cc70d · b9cc70d
1 parent e0191dd
commit b9cc70d
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 62 deletions.
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java
@@ -2559,7 +2559,7 @@ void onPlayerInfoChanged(PlayerInfo newPlayerInfo, BundlingExclusions bundlingEx
           /* eventFlag= */ Player.EVENT_PLAY_WHEN_READY_CHANGED,
           listener ->
               listener.onPlayWhenReadyChanged(
-                  finalPlayerInfo.playWhenReady, finalPlayerInfo.playWhenReadyChangedReason));
+                  finalPlayerInfo.playWhenReady, finalPlayerInfo.playWhenReadyChangeReason));
     }
     if (oldPlayerInfo.playbackSuppressionReason != finalPlayerInfo.playbackSuppressionReason) {
       listeners.queueEvent(

diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java
@@ -2240,7 +2240,7 @@ private static ControllerInfo createControllerInfo(
             /* deviceVolume= */ deviceVolume,
             /* deviceMuted= */ deviceMuted,
             /* playWhenReady= */ playWhenReady,
-            /* playWhenReadyChangedReason= */ PlayerInfo.PLAY_WHEN_READY_CHANGE_REASON_DEFAULT,
+            /* playWhenReadyChangeReason= */ PlayerInfo.PLAY_WHEN_READY_CHANGE_REASON_DEFAULT,
             /* playbackSuppressionReason= */ Player.PLAYBACK_SUPPRESSION_REASON_NONE,
             /* playbackState= */ playbackState,
             /* isPlaying= */ isPlaying,

diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java b/libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java
@@ -930,7 +930,7 @@ public void onPlaybackSuppressionReasonChanged(@Player.PlaybackSuppressionReason
       session.playerInfo =
           session.playerInfo.copyWithPlayWhenReady(
               session.playerInfo.playWhenReady,
-              session.playerInfo.playWhenReadyChangedReason,
+              session.playerInfo.playWhenReadyChangeReason,
               reason);
       session.onPlayerInfoChangedHandler.sendPlayerInfoChangedMessage(
           /* excludeTimeline= */ true, /* excludeTracks= */ true);

diff --git a/libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java b/libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java
@@ -137,7 +137,7 @@ public static class Builder {
     private int deviceVolume;
     private boolean deviceMuted;
     private boolean playWhenReady;
-    private @Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason;
+    private @Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason;
     private boolean isPlaying;
     private boolean isLoading;
     private @PlaybackSuppressionReason int playbackSuppressionReason;
@@ -169,7 +169,7 @@ public Builder(PlayerInfo playerInfo) {
       deviceVolume = playerInfo.deviceVolume;
       deviceMuted = playerInfo.deviceMuted;
       playWhenReady = playerInfo.playWhenReady;
-      playWhenReadyChangedReason = playerInfo.playWhenReadyChangedReason;
+      playWhenReadyChangeReason = playerInfo.playWhenReadyChangeReason;
       isPlaying = playerInfo.isPlaying;
       isLoading = playerInfo.isLoading;
       playbackSuppressionReason = playerInfo.playbackSuppressionReason;
@@ -298,9 +298,9 @@ public Builder setPlayWhenReady(boolean playWhenReady) {
     }
 
     @CanIgnoreReturnValue
-    public Builder setPlayWhenReadyChangedReason(
-        @Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason) {
-      this.playWhenReadyChangedReason = playWhenReadyChangedReason;
+    public Builder setPlayWhenReadyChangeReason(
+        @Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason) {
+      this.playWhenReadyChangeReason = playWhenReadyChangeReason;
       return this;
     }
 
@@ -389,7 +389,7 @@ public PlayerInfo build() {
           deviceVolume,
           deviceMuted,
           playWhenReady,
-          playWhenReadyChangedReason,
+          playWhenReadyChangeReason,
           playbackSuppressionReason,
           playbackState,
           isPlaying,
@@ -485,7 +485,7 @@ public PlayerInfo build() {
 
   public final boolean playWhenReady;
 
-  public final int playWhenReadyChangedReason;
+  public final int playWhenReadyChangeReason;
 
   public final boolean isPlaying;
 
@@ -510,11 +510,11 @@ public PlayerInfo build() {
   @CheckResult
   public PlayerInfo copyWithPlayWhenReady(
       boolean playWhenReady,
-      @Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason,
+      @Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason,
       @Player.PlaybackSuppressionReason int playbackSuppressionReason) {
     return new Builder(this)
         .setPlayWhenReady(playWhenReady)
-        .setPlayWhenReadyChangedReason(playWhenReadyChangedReason)
+        .setPlayWhenReadyChangeReason(playWhenReadyChangeReason)
         .setPlaybackSuppressionReason(playbackSuppressionReason)
         .setIsPlaying(isPlaying(playbackState, playWhenReady, playbackSuppressionReason))
         .build();
@@ -704,7 +704,7 @@ public PlayerInfo(
       int deviceVolume,
       boolean deviceMuted,
       boolean playWhenReady,
-      @Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason,
+      @Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason,
       @Player.PlaybackSuppressionReason int playbackSuppressionReason,
       @Player.State int playbackState,
       boolean isPlaying,
@@ -734,7 +734,7 @@ public PlayerInfo(
     this.deviceVolume = deviceVolume;
     this.deviceMuted = deviceMuted;
     this.playWhenReady = playWhenReady;
-    this.playWhenReadyChangedReason = playWhenReadyChangedReason;
+    this.playWhenReadyChangeReason = playWhenReadyChangeReason;
     this.playbackSuppressionReason = playbackSuppressionReason;
     this.playbackState = playbackState;
     this.isPlaying = isPlaying;
@@ -778,7 +778,7 @@ private boolean isPlaying(
   private static final String FIELD_DEVICE_VOLUME = Util.intToStringMaxRadix(10);
   private static final String FIELD_DEVICE_MUTED = Util.intToStringMaxRadix(11);
   private static final String FIELD_PLAY_WHEN_READY = Util.intToStringMaxRadix(12);
-  private static final String FIELD_PLAY_WHEN_READY_CHANGED_REASON = Util.intToStringMaxRadix(13);
+  private static final String FIELD_PLAY_WHEN_READY_CHANGE_REASON = Util.intToStringMaxRadix(13);
   private static final String FIELD_PLAYBACK_SUPPRESSION_REASON = Util.intToStringMaxRadix(14);
   private static final String FIELD_PLAYBACK_STATE = Util.intToStringMaxRadix(15);
   private static final String FIELD_IS_PLAYING = Util.intToStringMaxRadix(16);
@@ -938,9 +938,9 @@ private static PlayerInfo fromBundle(Bundle bundle) {
     int deviceVolume = bundle.getInt(FIELD_DEVICE_VOLUME, /* defaultValue= */ 0);
     boolean deviceMuted = bundle.getBoolean(FIELD_DEVICE_MUTED, /* defaultValue= */ false);
     boolean playWhenReady = bundle.getBoolean(FIELD_PLAY_WHEN_READY, /* defaultValue= */ false);
-    int playWhenReadyChangedReason =
+    int playWhenReadyChangeReason =
         bundle.getInt(
-            FIELD_PLAY_WHEN_READY_CHANGED_REASON,
+            FIELD_PLAY_WHEN_READY_CHANGE_REASON,
             /* defaultValue= */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST);
     @Player.PlaybackSuppressionReason
     int playbackSuppressionReason =
@@ -990,7 +990,7 @@ private static PlayerInfo fromBundle(Bundle bundle) {
         deviceVolume,
         deviceMuted,
         playWhenReady,
-        playWhenReadyChangedReason,
+        playWhenReadyChangeReason,
         playbackSuppressionReason,
         playbackState,
         isPlaying,

diff --git a/libraries/session/src/test/java/androidx/media3/session/PlayerInfoTest.java b/libraries/session/src/test/java/androidx/media3/session/PlayerInfoTest.java
@@ -150,7 +150,7 @@ public void toBundleFromBundle_withAllCommands_restoresAllData() {
                 new PlaybackException(
                     /* message= */ null, /* cause= */ null, PlaybackException.ERROR_CODE_TIMEOUT))
             .setPlayWhenReady(true)
-            .setPlayWhenReadyChangedReason(Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST)
+            .setPlayWhenReadyChangeReason(Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST)
             .setRepeatMode(Player.REPEAT_MODE_ONE)
             .setSeekBackIncrement(7000)
             .setSeekForwardIncrement(6000)
@@ -225,7 +225,7 @@ public void toBundleFromBundle_withAllCommands_restoresAllData() {
     assertThat(infoAfterBundling.playerError.errorCode)
         .isEqualTo(PlaybackException.ERROR_CODE_TIMEOUT);
     assertThat(infoAfterBundling.playWhenReady).isTrue();
-    assertThat(infoAfterBundling.playWhenReadyChangedReason)
+    assertThat(infoAfterBundling.playWhenReadyChangeReason)
         .isEqualTo(Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST);
     assertThat(infoAfterBundling.repeatMode).isEqualTo(Player.REPEAT_MODE_ONE);
     assertThat(infoAfterBundling.seekBackIncrementMs).isEqualTo(7000);