commit 50f118a1214d00a4be1cadc9efb2bcf787927f3f
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 15 15:40:10 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 15 15:40:10 2018 +0000
tree 841989e1dc914c6fb469dcd52d301a3f87ad1599
parent d2f757bdd9ced844f9724558f776a9e2cbcaa2e6
parent 096d97ac3e01d3a148f6148180c375f9337b64e5

Merge "MediaPlayer2Impl: fix several functions" into pi-dev

media/java/android/media/MediaPlayer2Impl.java

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