Skip to content

Commit b9cc70d

Browse files
oceanjulestof-tof
authored andcommitted
Fixed spelling across various PlayerInfo *ChangeReason fields
PiperOrigin-RevId: 541892788
1 parent e0191dd commit b9cc70d

File tree

7 files changed

+62
-62
lines changed

7 files changed

+62
-62
lines changed

libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2559,7 +2559,7 @@ void onPlayerInfoChanged(PlayerInfo newPlayerInfo, BundlingExclusions bundlingEx
25592559
/* eventFlag= */ Player.EVENT_PLAY_WHEN_READY_CHANGED,
25602560
listener ->
25612561
listener.onPlayWhenReadyChanged(
2562-
finalPlayerInfo.playWhenReady, finalPlayerInfo.playWhenReadyChangedReason));
2562+
finalPlayerInfo.playWhenReady, finalPlayerInfo.playWhenReadyChangeReason));
25632563
}
25642564
if (oldPlayerInfo.playbackSuppressionReason != finalPlayerInfo.playbackSuppressionReason) {
25652565
listeners.queueEvent(

libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,7 @@ private static ControllerInfo createControllerInfo(
22402240
/* deviceVolume= */ deviceVolume,
22412241
/* deviceMuted= */ deviceMuted,
22422242
/* playWhenReady= */ playWhenReady,
2243-
/* playWhenReadyChangedReason= */ PlayerInfo.PLAY_WHEN_READY_CHANGE_REASON_DEFAULT,
2243+
/* playWhenReadyChangeReason= */ PlayerInfo.PLAY_WHEN_READY_CHANGE_REASON_DEFAULT,
22442244
/* playbackSuppressionReason= */ Player.PLAYBACK_SUPPRESSION_REASON_NONE,
22452245
/* playbackState= */ playbackState,
22462246
/* isPlaying= */ isPlaying,

libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ public void onPlaybackSuppressionReasonChanged(@Player.PlaybackSuppressionReason
930930
session.playerInfo =
931931
session.playerInfo.copyWithPlayWhenReady(
932932
session.playerInfo.playWhenReady,
933-
session.playerInfo.playWhenReadyChangedReason,
933+
session.playerInfo.playWhenReadyChangeReason,
934934
reason);
935935
session.onPlayerInfoChangedHandler.sendPlayerInfoChangedMessage(
936936
/* excludeTimeline= */ true, /* excludeTracks= */ true);

libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public static class Builder {
137137
private int deviceVolume;
138138
private boolean deviceMuted;
139139
private boolean playWhenReady;
140-
private @Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason;
140+
private @Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason;
141141
private boolean isPlaying;
142142
private boolean isLoading;
143143
private @PlaybackSuppressionReason int playbackSuppressionReason;
@@ -169,7 +169,7 @@ public Builder(PlayerInfo playerInfo) {
169169
deviceVolume = playerInfo.deviceVolume;
170170
deviceMuted = playerInfo.deviceMuted;
171171
playWhenReady = playerInfo.playWhenReady;
172-
playWhenReadyChangedReason = playerInfo.playWhenReadyChangedReason;
172+
playWhenReadyChangeReason = playerInfo.playWhenReadyChangeReason;
173173
isPlaying = playerInfo.isPlaying;
174174
isLoading = playerInfo.isLoading;
175175
playbackSuppressionReason = playerInfo.playbackSuppressionReason;
@@ -298,9 +298,9 @@ public Builder setPlayWhenReady(boolean playWhenReady) {
298298
}
299299

300300
@CanIgnoreReturnValue
301-
public Builder setPlayWhenReadyChangedReason(
302-
@Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason) {
303-
this.playWhenReadyChangedReason = playWhenReadyChangedReason;
301+
public Builder setPlayWhenReadyChangeReason(
302+
@Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason) {
303+
this.playWhenReadyChangeReason = playWhenReadyChangeReason;
304304
return this;
305305
}
306306

@@ -389,7 +389,7 @@ public PlayerInfo build() {
389389
deviceVolume,
390390
deviceMuted,
391391
playWhenReady,
392-
playWhenReadyChangedReason,
392+
playWhenReadyChangeReason,
393393
playbackSuppressionReason,
394394
playbackState,
395395
isPlaying,
@@ -485,7 +485,7 @@ public PlayerInfo build() {
485485

486486
public final boolean playWhenReady;
487487

488-
public final int playWhenReadyChangedReason;
488+
public final int playWhenReadyChangeReason;
489489

490490
public final boolean isPlaying;
491491

@@ -510,11 +510,11 @@ public PlayerInfo build() {
510510
@CheckResult
511511
public PlayerInfo copyWithPlayWhenReady(
512512
boolean playWhenReady,
513-
@Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason,
513+
@Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason,
514514
@Player.PlaybackSuppressionReason int playbackSuppressionReason) {
515515
return new Builder(this)
516516
.setPlayWhenReady(playWhenReady)
517-
.setPlayWhenReadyChangedReason(playWhenReadyChangedReason)
517+
.setPlayWhenReadyChangeReason(playWhenReadyChangeReason)
518518
.setPlaybackSuppressionReason(playbackSuppressionReason)
519519
.setIsPlaying(isPlaying(playbackState, playWhenReady, playbackSuppressionReason))
520520
.build();
@@ -704,7 +704,7 @@ public PlayerInfo(
704704
int deviceVolume,
705705
boolean deviceMuted,
706706
boolean playWhenReady,
707-
@Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason,
707+
@Player.PlayWhenReadyChangeReason int playWhenReadyChangeReason,
708708
@Player.PlaybackSuppressionReason int playbackSuppressionReason,
709709
@Player.State int playbackState,
710710
boolean isPlaying,
@@ -734,7 +734,7 @@ public PlayerInfo(
734734
this.deviceVolume = deviceVolume;
735735
this.deviceMuted = deviceMuted;
736736
this.playWhenReady = playWhenReady;
737-
this.playWhenReadyChangedReason = playWhenReadyChangedReason;
737+
this.playWhenReadyChangeReason = playWhenReadyChangeReason;
738738
this.playbackSuppressionReason = playbackSuppressionReason;
739739
this.playbackState = playbackState;
740740
this.isPlaying = isPlaying;
@@ -778,7 +778,7 @@ private boolean isPlaying(
778778
private static final String FIELD_DEVICE_VOLUME = Util.intToStringMaxRadix(10);
779779
private static final String FIELD_DEVICE_MUTED = Util.intToStringMaxRadix(11);
780780
private static final String FIELD_PLAY_WHEN_READY = Util.intToStringMaxRadix(12);
781-
private static final String FIELD_PLAY_WHEN_READY_CHANGED_REASON = Util.intToStringMaxRadix(13);
781+
private static final String FIELD_PLAY_WHEN_READY_CHANGE_REASON = Util.intToStringMaxRadix(13);
782782
private static final String FIELD_PLAYBACK_SUPPRESSION_REASON = Util.intToStringMaxRadix(14);
783783
private static final String FIELD_PLAYBACK_STATE = Util.intToStringMaxRadix(15);
784784
private static final String FIELD_IS_PLAYING = Util.intToStringMaxRadix(16);
@@ -938,9 +938,9 @@ private static PlayerInfo fromBundle(Bundle bundle) {
938938
int deviceVolume = bundle.getInt(FIELD_DEVICE_VOLUME, /* defaultValue= */ 0);
939939
boolean deviceMuted = bundle.getBoolean(FIELD_DEVICE_MUTED, /* defaultValue= */ false);
940940
boolean playWhenReady = bundle.getBoolean(FIELD_PLAY_WHEN_READY, /* defaultValue= */ false);
941-
int playWhenReadyChangedReason =
941+
int playWhenReadyChangeReason =
942942
bundle.getInt(
943-
FIELD_PLAY_WHEN_READY_CHANGED_REASON,
943+
FIELD_PLAY_WHEN_READY_CHANGE_REASON,
944944
/* defaultValue= */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST);
945945
@Player.PlaybackSuppressionReason
946946
int playbackSuppressionReason =
@@ -990,7 +990,7 @@ private static PlayerInfo fromBundle(Bundle bundle) {
990990
deviceVolume,
991991
deviceMuted,
992992
playWhenReady,
993-
playWhenReadyChangedReason,
993+
playWhenReadyChangeReason,
994994
playbackSuppressionReason,
995995
playbackState,
996996
isPlaying,

libraries/session/src/test/java/androidx/media3/session/PlayerInfoTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void toBundleFromBundle_withAllCommands_restoresAllData() {
150150
new PlaybackException(
151151
/* message= */ null, /* cause= */ null, PlaybackException.ERROR_CODE_TIMEOUT))
152152
.setPlayWhenReady(true)
153-
.setPlayWhenReadyChangedReason(Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST)
153+
.setPlayWhenReadyChangeReason(Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST)
154154
.setRepeatMode(Player.REPEAT_MODE_ONE)
155155
.setSeekBackIncrement(7000)
156156
.setSeekForwardIncrement(6000)
@@ -225,7 +225,7 @@ public void toBundleFromBundle_withAllCommands_restoresAllData() {
225225
assertThat(infoAfterBundling.playerError.errorCode)
226226
.isEqualTo(PlaybackException.ERROR_CODE_TIMEOUT);
227227
assertThat(infoAfterBundling.playWhenReady).isTrue();
228-
assertThat(infoAfterBundling.playWhenReadyChangedReason)
228+
assertThat(infoAfterBundling.playWhenReadyChangeReason)
229229
.isEqualTo(Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST);
230230
assertThat(infoAfterBundling.repeatMode).isEqualTo(Player.REPEAT_MODE_ONE);
231231
assertThat(infoAfterBundling.seekBackIncrementMs).isEqualTo(7000);

0 commit comments

Comments
 (0)