diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 08:16:32 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 08:16:32 +0000 |
| commit | 04707e4802ae8210b567cd85ff3531d1188d7582 (patch) | |
| tree | e83ca5c0d6e953e5416e787409c586ced741e411 /media | |
| parent | 5af3086b6da03588f8e1f1642d8977c9bddd7060 (diff) | |
| download | chromium_src-04707e4802ae8210b567cd85ff3531d1188d7582.zip chromium_src-04707e4802ae8210b567cd85ff3531d1188d7582.tar.gz chromium_src-04707e4802ae8210b567cd85ff3531d1188d7582.tar.bz2 | |
check the permission for wake lock before calling setWakeMode
Review URL: https://chromiumcodereview.appspot.com/11362018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/java/src/org/chromium/media/MediaPlayerListener.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java index 7ab0fe8..7381ee1 100644 --- a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java +++ b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java @@ -5,6 +5,8 @@ package org.chromium.media; import android.content.Context; +import android.content.pm.PackageManager; +import android.Manifest.permission; import android.media.MediaPlayer; import org.chromium.base.CalledByNative; @@ -93,7 +95,10 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener, mediaPlayer.setOnPreparedListener(listener); mediaPlayer.setOnSeekCompleteListener(listener); mediaPlayer.setOnVideoSizeChangedListener(listener); - mediaPlayer.setWakeMode(context, android.os.PowerManager.FULL_WAKE_LOCK); + if (PackageManager.PERMISSION_GRANTED == + context.checkCallingPermission(permission.WAKE_LOCK)) { + mediaPlayer.setWakeMode(context, android.os.PowerManager.FULL_WAKE_LOCK); + } } /** |