From 30d4a498c4bb99eb16d8bfd8ccfdd413c1dad881 Mon Sep 17 00:00:00 2001
From: qinzhichao <qinzhichao@xiaomi.com>
Date: Wed, 4 Jan 2017 14:51:33 +0800
Subject: [PATCH] Fix NullPointerException in MediaPlayer

Issue detail:
https://code.google.com/p/android/issues/detail?id=231417

setSubtitleAnchor() is a synchronized method and has checked
mSubtitleController. So checking for null pointer is not
needed in scanInternalSubtitleTracks() method.

Signed-off-by: qinzhichao <qinzhichao@xiaomi.com>
---
 media/java/android/media/MediaPlayer.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 949acc0e17584..d0f8b73bbbeb9 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -2336,10 +2336,7 @@ public class MediaPlayer extends PlayerBase
     }
 
     private void scanInternalSubtitleTracks() {
-        if (mSubtitleController == null) {
-            Log.d(TAG, "setSubtitleAnchor in MediaPlayer");
-            setSubtitleAnchor();
-        }
+        setSubtitleAnchor();
 
         populateInbandTracks();