Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdaa3abd authored by The Android Automerger's avatar The Android Automerger Committed by Android Git Automerger
Browse files

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

* commit '44e39d60':
  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
parents 5033d2b5 44e39d60

core/java/android/webkit/HTML5VideoViewProxy.java

+3 −1
Original line number Diff line number Diff line
@@ -184,7 +184,9 @@ class HTML5VideoViewProxy extends Handler 
                // we need to pause the old one and re-create a new media player

                // inside the HTML5VideoView.

                if (mHTML5VideoView != null) {

                    if (!backFromFullScreenMode) {

                        mHTML5VideoView.pauseAndDispatch(mCurrentProxy);

                    }

                    // release the media player to avoid finalize error

                    mHTML5VideoView.release();

                }