Merge "Fix CalledFromWrongThreadException in MediaPlayer's subtitle support" into klp-dev

2013-09-13 02:16:27 +00:00
parent 2a65a2839e 9d48089595
commit 8c16943ef3
1 changed files with 4 additions and 3 deletions
--- 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;
                }