Merge "MediaPlayer2Impl: fix several functions" into pi-dev (50f118a1) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer2Impl.java

+5 −9

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}