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

am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

Browse Source 
* commit '44e39d608cfddcbf56123480123822f26f20f259':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes
This commit is contained in:
The Android Automerger
2011-05-09 10:40:14 -07:00
committed by Android Git Automerger
parent 5033d2b528 44e39d608c
commit bdaa3abdf2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/HTML5VideoViewProxy.java
View File

@@ -184,7 +184,9 @@ class HTML5VideoViewProxy extends Handler
// we need to pause the old one and re-create a new media player // we need to pause the old one and re-create a new media player
// inside the HTML5VideoView. // inside the HTML5VideoView.
if (mHTML5VideoView != null) { if (mHTML5VideoView != null) {
if (!backFromFullScreenMode) {
mHTML5VideoView.pauseAndDispatch(mCurrentProxy); mHTML5VideoView.pauseAndDispatch(mCurrentProxy);
}
// release the media player to avoid finalize error // release the media player to avoid finalize error
mHTML5VideoView.release(); mHTML5VideoView.release();
} }