commit 2616b08d4d8295dd8cd14565e49617e8ac1ad68c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 27 17:37:38 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 27 17:37:38 2018 +0000
tree 2d2020b69f90b93ffa4abc9270c63b37aef125ed
parent 18bec393e484462a4dd933909b42e7ee6617fc0a
parent f5e7900370f54cc24254425af9a34bf9885b5d61

Merge "MediaPlayer2: allow prepared->pause"

media/java/android/media/MediaPlayer2Impl.java

diff --git a/media/java/android/media/MediaPlayer2Impl.java b/media/java/android/media/MediaPlayer2Impl.java
index 6b48f09..7b7b800 100644
--- a/media/java/android/media/MediaPlayer2Impl.java
+++ b/media/java/android/media/MediaPlayer2Impl.java
@@ -254,22 +254,6 @@
             void process() {
                 stayAwake(false);
 
-                // TODO: remove this block when native code allows prepared -> pause
-                // and sends MEDIA_INFO_DATA_SOURCE_START when pipeline is created.
-                if (getState() == PLAYER_STATE_PREPARED) {
-                    final DataSourceDesc dsd;
-                    synchronized (mSrcLock) {
-                        dsd = mCurrentDSD;
-                    }
-                    sendEvent(new EventNotifier() {
-                        @Override
-                        public void notify(EventCallback callback) {
-                            callback.onInfo(
-                                    MediaPlayer2Impl.this, dsd, MEDIA_INFO_DATA_SOURCE_START, 0);
-                        }
-                    });
-                }
-
                 _pause();
             }
         });