mediaplayer2: rename getMediaPlayer2State to getState
Test: MediaPlayer2Test
Bug: 109928575
Change-Id: Ib357cdd82bde0b298c5d9e749267737bd0cd3af3
diff --git a/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Types.h b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Types.h
index 3905b55..2fb5a2c 100644
--- a/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Types.h
+++ b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Types.h
@@ -150,11 +150,11 @@
// Do not change these values without updating their counterparts in MediaPlayer2.java
enum mediaplayer2_states {
- MEDIAPLAYER2_STATE_IDLE = 1,
- MEDIAPLAYER2_STATE_PREPARED = 2,
- MEDIAPLAYER2_STATE_PLAYING = 3,
- MEDIAPLAYER2_STATE_PAUSED = 4,
- MEDIAPLAYER2_STATE_ERROR = 5,
+ MEDIAPLAYER2_STATE_IDLE = 1001,
+ MEDIAPLAYER2_STATE_PREPARED = 1002,
+ MEDIAPLAYER2_STATE_PLAYING = 1003,
+ MEDIAPLAYER2_STATE_PAUSED = 1004,
+ MEDIAPLAYER2_STATE_ERROR = 1005,
};
enum media_player2_internal_states {
diff --git a/media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h b/media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h
index d586192..3af212e 100644
--- a/media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h
+++ b/media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h
@@ -68,7 +68,7 @@
status_t stop();
status_t pause();
bool isPlaying();
- mediaplayer2_states getMediaPlayer2State();
+ mediaplayer2_states getState();
status_t setPlaybackSettings(const AudioPlaybackRate& rate);
status_t getPlaybackSettings(AudioPlaybackRate* rate /* nonnull */);
status_t setSyncSettings(const AVSyncSettings& sync, float videoFpsHint);
diff --git a/media/libmediaplayer2/mediaplayer2.cpp b/media/libmediaplayer2/mediaplayer2.cpp
index e5567dc..4fb47b8 100644
--- a/media/libmediaplayer2/mediaplayer2.cpp
+++ b/media/libmediaplayer2/mediaplayer2.cpp
@@ -860,7 +860,7 @@
return false;
}
-mediaplayer2_states MediaPlayer2::getMediaPlayer2State() {
+mediaplayer2_states MediaPlayer2::getState() {
Mutex::Autolock _l(mLock);
if (mCurrentState & MEDIA_PLAYER2_STATE_ERROR) {
return MEDIAPLAYER2_STATE_ERROR;