Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev

Browse Source 
* commit '8c16943ef3259b8194c310d41edc13a783249250':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
This commit is contained in:
Lajos Molnar
2013-09-12 21:37:58 -07:00
committed by Android Git Automerger
parent aca95ca0e3 8c16943ef3
commit 736469ad5d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/MediaPlayer.java
View File

@@ -1819,8 +1819,6 @@ public class MediaPlayer implements SubtitleController.Listener
scanner.close(); scanner.close();
mOutOfBandSubtitleTracks.add(track); mOutOfBandSubtitleTracks.add(track);
track.onData(contents, true /* eos */, ~0 /* runID: keep forever */); track.onData(contents, true /* eos */, ~0 /* runID: keep forever */);
// update default track selection
mSubtitleController.selectDefaultTrack();
return MEDIA_INFO_EXTERNAL_METADATA_UPDATE; return MEDIA_INFO_EXTERNAL_METADATA_UPDATE;
} }
@@ -2232,9 +2230,12 @@ public class MediaPlayer implements SubtitleController.Listener
break; break;
case MEDIA_INFO_METADATA_UPDATE: case MEDIA_INFO_METADATA_UPDATE:
scanInternalSubtitleTracks(); scanInternalSubtitleTracks();
break; // fall through
case MEDIA_INFO_EXTERNAL_METADATA_UPDATE: case MEDIA_INFO_EXTERNAL_METADATA_UPDATE:
msg.arg1 = MEDIA_INFO_METADATA_UPDATE; msg.arg1 = MEDIA_INFO_METADATA_UPDATE;
// update default track selection
mSubtitleController.selectDefaultTrack();
break; break;
} }