Merge "MediaPlayer2Impl: fix null object reference." into pi-dev

am: 2d76c3ce82

Change-Id: Ib38e150756b7843774a6e6fe7c605739ae34a417
This commit is contained in:
Wei Jia
2018-03-16 00:55:06 +00:00
committed by android-build-merger

View File

@@ -115,8 +115,8 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
private boolean mNextSourcePlayPending = false; private boolean mNextSourcePlayPending = false;
//--- guarded by |mSrcLock| end //--- guarded by |mSrcLock| end
private AtomicInteger mBufferedPercentageCurrent; private AtomicInteger mBufferedPercentageCurrent = new AtomicInteger(0);
private AtomicInteger mBufferedPercentageNext; private AtomicInteger mBufferedPercentageNext = new AtomicInteger(0);
private volatile float mVolume = 1.0f; private volatile float mVolume = 1.0f;
// Modular DRM // Modular DRM