diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-26 17:10:41 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-26 17:36:11 -0700 |
| commit | fb2fd5f52c3de68ea8395eb0b5e5543e8ab26763 (patch) | |
| tree | 306811e2211f84148c9a5ae61f2d2a7aa3a4befc /core/java/android/webkit/HTML5VideoInline.java | |
| parent | ea1c7f3c5175f6e83dddd381b9a809ec52a9320f (diff) | |
Double check the permission before setting the Wake Lock
bug:5361732
Change-Id: Ia9092b25d62c4a14cba885f5e3fac0326d0fde1c
Diffstat (limited to 'core/java/android/webkit/HTML5VideoInline.java')
| -rw-r--r-- | core/java/android/webkit/HTML5VideoInline.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/webkit/HTML5VideoInline.java b/core/java/android/webkit/HTML5VideoInline.java index 97dc2918a2c9..42581c2fa51d 100644 --- a/core/java/android/webkit/HTML5VideoInline.java +++ b/core/java/android/webkit/HTML5VideoInline.java @@ -1,6 +1,8 @@ package android.webkit; +import android.Manifest.permission; +import android.content.pm.PackageManager; import android.graphics.SurfaceTexture; import android.media.MediaPlayer; import android.webkit.HTML5VideoView; @@ -52,7 +54,12 @@ public class HTML5VideoInline extends HTML5VideoView{ public void prepareDataAndDisplayMode(HTML5VideoViewProxy proxy) { super.prepareDataAndDisplayMode(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 |