summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/MediaPlayer.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index bcdc1c810325..7acf8afe87a1 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1819,8 +1819,6 @@ public class MediaPlayer implements SubtitleController.Listener
scanner.close();
mOutOfBandSubtitleTracks.add(track);
track.onData(contents, true /* eos */, ~0 /* runID: keep forever */);
- // update default track selection
- mSubtitleController.selectDefaultTrack();
return MEDIA_INFO_EXTERNAL_METADATA_UPDATE;
}
@@ -2232,9 +2230,12 @@ public class MediaPlayer implements SubtitleController.Listener
break;
case MEDIA_INFO_METADATA_UPDATE:
scanInternalSubtitleTracks();
- break;
+ // fall through
+
case MEDIA_INFO_EXTERNAL_METADATA_UPDATE:
msg.arg1 = MEDIA_INFO_METADATA_UPDATE;
+ // update default track selection
+ mSubtitleController.selectDefaultTrack();
break;
}