summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-03-15 22:54:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-03-15 22:54:49 +0000
commit2d76c3ce8216f18c0a81eb53c8479887581cc43c (patch)
tree087c2f9c839a41d44cf569711ef55a56e4c88ae7
parent25300a1ff23bd3cd66148903dac77948d53dabda (diff)
parent371144fcc23f3d0a668d0d51bd3c3f90c964cd7b (diff)
Merge "MediaPlayer2Impl: fix null object reference." into pi-dev
-rw-r--r--media/java/android/media/MediaPlayer2Impl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaPlayer2Impl.java b/media/java/android/media/MediaPlayer2Impl.java
index 030e50d67df9..56423fda0404 100644
--- a/media/java/android/media/MediaPlayer2Impl.java
+++ b/media/java/android/media/MediaPlayer2Impl.java
@@ -115,8 +115,8 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
private boolean mNextSourcePlayPending = false;
//--- guarded by |mSrcLock| end
- private AtomicInteger mBufferedPercentageCurrent;
- private AtomicInteger mBufferedPercentageNext;
+ private AtomicInteger mBufferedPercentageCurrent = new AtomicInteger(0);
+ private AtomicInteger mBufferedPercentageNext = new AtomicInteger(0);
private volatile float mVolume = 1.0f;
// Modular DRM