mirror of
https://github.com/androidx/media.git
synced 2025-04-30 06:46:50 +08:00
Remove deprecated hasPreviousWindow() and hasPrevious() methods.
Use Player.hasPreviousMediaItem() and Player.seekToPreviousMediaItem() instead. PiperOrigin-RevId: 647664991
This commit is contained in:
parent
18b28cd625
commit
e4d4a776c3
@ -57,8 +57,10 @@
|
|||||||
* Use `HttpEngineDataSource` as the `HttpDataSource` when supported by the
|
* Use `HttpEngineDataSource` as the `HttpDataSource` when supported by the
|
||||||
device.
|
device.
|
||||||
* Remove deprecated symbols:
|
* Remove deprecated symbols:
|
||||||
* Remove deprecated `Player#hasPrevious` method. Use
|
* Remove deprecated `Player.hasPrevious`, `Player.hasPreviousWindow()`.
|
||||||
`Player#hasPreviousMediaItem()` instead.
|
Use `Player.hasPreviousMediaItem()` instead.
|
||||||
|
* Remove deprecated `Player.previous()`method. Use
|
||||||
|
`Player.seekToPreviousMediaItem()` instead.
|
||||||
* Remove deprecated `DrmSessionEventListener.onDrmSessionAcquired` method.
|
* Remove deprecated `DrmSessionEventListener.onDrmSessionAcquired` method.
|
||||||
|
|
||||||
## 1.4
|
## 1.4
|
||||||
|
@ -147,29 +147,11 @@ public abstract class BasePlayer implements Player {
|
|||||||
seekToOffset(getSeekForwardIncrement(), Player.COMMAND_SEEK_FORWARD);
|
seekToOffset(getSeekForwardIncrement(), Player.COMMAND_SEEK_FORWARD);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #hasPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public final boolean hasPreviousWindow() {
|
|
||||||
return hasPreviousMediaItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final boolean hasPreviousMediaItem() {
|
public final boolean hasPreviousMediaItem() {
|
||||||
return getPreviousMediaItemIndex() != C.INDEX_UNSET;
|
return getPreviousMediaItemIndex() != C.INDEX_UNSET;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public final void previous() {
|
|
||||||
seekToPreviousMediaItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
||||||
*/
|
*/
|
||||||
|
@ -327,36 +327,12 @@ public class ForwardingPlayer implements Player {
|
|||||||
player.seekForward();
|
player.seekForward();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Calls {@link Player#hasPreviousWindow()} on the delegate and returns the result.
|
|
||||||
*
|
|
||||||
* @deprecated Use {@link #hasPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("deprecation") // Forwarding to deprecated method
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public boolean hasPreviousWindow() {
|
|
||||||
return player.hasPreviousWindow();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Calls {@link Player#hasPreviousMediaItem()} on the delegate and returns the result. */
|
/** Calls {@link Player#hasPreviousMediaItem()} on the delegate and returns the result. */
|
||||||
@Override
|
@Override
|
||||||
public boolean hasPreviousMediaItem() {
|
public boolean hasPreviousMediaItem() {
|
||||||
return player.hasPreviousMediaItem();
|
return player.hasPreviousMediaItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Calls {@link Player#previous()} on the delegate.
|
|
||||||
*
|
|
||||||
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("deprecation") // Forwarding to deprecated method
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public void previous() {
|
|
||||||
player.previous();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calls {@link Player#seekToPreviousWindow()} on the delegate.
|
* Calls {@link Player#seekToPreviousWindow()} on the delegate.
|
||||||
*
|
*
|
||||||
|
@ -2635,13 +2635,6 @@ public interface Player {
|
|||||||
*/
|
*/
|
||||||
void seekForward();
|
void seekForward();
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #hasPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@UnstableApi
|
|
||||||
@Deprecated
|
|
||||||
boolean hasPreviousWindow();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns whether a previous media item exists, which may depend on the current repeat mode and
|
* Returns whether a previous media item exists, which may depend on the current repeat mode and
|
||||||
* whether shuffle mode is enabled.
|
* whether shuffle mode is enabled.
|
||||||
@ -2655,13 +2648,6 @@ public interface Player {
|
|||||||
*/
|
*/
|
||||||
boolean hasPreviousMediaItem();
|
boolean hasPreviousMediaItem();
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@UnstableApi
|
|
||||||
@Deprecated
|
|
||||||
void previous();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
||||||
*/
|
*/
|
||||||
|
@ -1437,16 +1437,6 @@ public class MediaController implements Player {
|
|||||||
return hasNextMediaItem();
|
return hasNextMediaItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #hasPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@UnstableApi
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public final boolean hasPreviousWindow() {
|
|
||||||
return hasPreviousMediaItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use {@link #hasNextMediaItem()} instead.
|
* @deprecated Use {@link #hasNextMediaItem()} instead.
|
||||||
*/
|
*/
|
||||||
@ -1469,16 +1459,6 @@ public class MediaController implements Player {
|
|||||||
return isConnected() && impl.hasNextMediaItem();
|
return isConnected() && impl.hasNextMediaItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@UnstableApi
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public final void previous() {
|
|
||||||
seekToPreviousMediaItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use {@link #seekToNextMediaItem()} instead.
|
* @deprecated Use {@link #seekToNextMediaItem()} instead.
|
||||||
*/
|
*/
|
||||||
|
@ -565,14 +565,6 @@ import java.util.List;
|
|||||||
return super.hasNext();
|
return super.hasNext();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("deprecation") // Forwarding deprecated call
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public boolean hasPreviousWindow() {
|
|
||||||
verifyApplicationThread();
|
|
||||||
return super.hasPreviousWindow();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation") // Forwarding deprecated call
|
@SuppressWarnings("deprecation") // Forwarding deprecated call
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@Override
|
@Override
|
||||||
@ -593,14 +585,6 @@ import java.util.List;
|
|||||||
return super.hasNextMediaItem();
|
return super.hasNextMediaItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("deprecation") // Forwarding deprecated call
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public void previous() {
|
|
||||||
verifyApplicationThread();
|
|
||||||
super.previous();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation") // Forwarding deprecated call
|
@SuppressWarnings("deprecation") // Forwarding deprecated call
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@Override
|
@Override
|
||||||
|
@ -1089,15 +1089,6 @@ public class MockPlayer implements Player {
|
|||||||
throw new UnsupportedOperationException();
|
throw new UnsupportedOperationException();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #hasPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public boolean hasPreviousWindow() {
|
|
||||||
throw new UnsupportedOperationException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use {@link #hasNextMediaItem()} instead.
|
* @deprecated Use {@link #hasNextMediaItem()} instead.
|
||||||
*/
|
*/
|
||||||
@ -1117,15 +1108,6 @@ public class MockPlayer implements Player {
|
|||||||
throw new UnsupportedOperationException();
|
throw new UnsupportedOperationException();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link #seekToPreviousMediaItem()} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public void previous() {
|
|
||||||
throw new UnsupportedOperationException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use {@link #seekToNextMediaItem()} instead.
|
* @deprecated Use {@link #seekToNextMediaItem()} instead.
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user