diff options
| -rw-r--r-- | media/java/android/media/MediaPlayer2Impl.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/media/java/android/media/MediaPlayer2Impl.java b/media/java/android/media/MediaPlayer2Impl.java index 1c4d898acb4f..030e50d67df9 100644 --- a/media/java/android/media/MediaPlayer2Impl.java +++ b/media/java/android/media/MediaPlayer2Impl.java @@ -82,7 +82,6 @@ import java.util.Vector; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; - /** * @hide */ @@ -118,6 +117,7 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { private AtomicInteger mBufferedPercentageCurrent; private AtomicInteger mBufferedPercentageNext; + private volatile float mVolume = 1.0f; // Modular DRM private final Object mDrmLock = new Object(); @@ -553,6 +553,7 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { addTask(new Task(CALL_COMPLETED_SET_PLAYER_VOLUME, false) { @Override void process() { + mVolume = volume; _setVolume(volume, volume); } }); @@ -567,8 +568,7 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { */ @Override public float getPlayerVolume() { - // TODO: get real volume - return 1.0f; + return mVolume; } /** @@ -3227,9 +3227,7 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { @Override public void clearMediaPlayer2EventCallback() { synchronized (mEventCbLock) { - for (Pair<Executor, MediaPlayer2EventCallback> cb : mEventCallbackRecords) { - mEventCallbackRecords.remove(cb); - } + mEventCallbackRecords.clear(); } } @@ -3300,9 +3298,7 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { @Override public void clearDrmEventCallback() { synchronized (mDrmEventCbLock) { - for (Pair<Executor, DrmEventCallback> cb : mDrmEventCallbackRecords) { - mDrmEventCallbackRecords.remove(cb); - } + mDrmEventCallbackRecords.clear(); } } |