commit 8d48b75b0cdc14bdec445074e8406a2cc5ea0924
author Teng-Hui Zhu <ztenghui@google.com> Tue Sep 27 09:07:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 09:07:13 2011 -0700
tree 76eae16444587a091822595d151a8f375138dea5
parent cbb62bb81807ff83a0887b90111218d81a3f57df
parent fb2fd5f52c3de68ea8395eb0b5e5543e8ab26763

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

core/java/android/webkit/HTML5VideoInline.java

diff --git a/core/java/android/webkit/HTML5VideoInline.java b/core/java/android/webkit/HTML5VideoInline.java
index 97dc291..42581c2 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 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