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

Merge "Double check the permission before setting the Wake Lock"

Browse Source
This commit is contained in:
Teng-Hui Zhu
2011-09-27 09:07:13 -07:00
committed by Android (Google) Code Review
parent cbb62bb818 fb2fd5f52c
commit 8d48b75b0c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/webkit/HTML5VideoInline.java
View File

@@ -1,6 +1,8 @@
package android.webkit; package android.webkit;
import android.Manifest.permission;
import android.content.pm.PackageManager;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.webkit.HTML5VideoView; import android.webkit.HTML5VideoView;
@@ -52,7 +54,12 @@ public class HTML5VideoInline extends HTML5VideoView{
public void prepareDataAndDisplayMode(HTML5VideoViewProxy proxy) { public void prepareDataAndDisplayMode(HTML5VideoViewProxy proxy) {
super.prepareDataAndDisplayMode(proxy); super.prepareDataAndDisplayMode(proxy);
setFrameAvailableListener(proxy); setFrameAvailableListener(proxy);
mPlayer.setWakeMode(proxy.getContext(), PowerManager.FULL_WAKE_LOCK); // TODO: This is a workaround, after b/5375681 fixed, we should switch
// to the better way.
if (mProxy.getContext().checkCallingOrSelfPermission(permission.WAKE_LOCK)
== PackageManager.PERMISSION_GRANTED) {
mPlayer.setWakeMode(proxy.getContext(), PowerManager.FULL_WAKE_LOCK);
}
} }
// Pause the play and update the play/pause button // Pause the play and update the play/pause button