diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-05-20 15:42:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-20 15:42:31 -0700 |
| commit | 850ae9acda0d062f9a1836d159bdce819e0f8066 (patch) | |
| tree | 5eac048bd5cfae048ae9a489215173910ac05569 | |
| parent | cbc38e74f028d9e337eba0f3ed7c435310cc10c2 (diff) | |
| parent | 817c161ef27b6087c496755768d65fcb4f78f04c (diff) | |
| download | frameworks_base-850ae9acda0d062f9a1836d159bdce819e0f8066.zip frameworks_base-850ae9acda0d062f9a1836d159bdce819e0f8066.tar.gz frameworks_base-850ae9acda0d062f9a1836d159bdce819e0f8066.tar.bz2 | |
Merge "Bug 4184736 unhide MediaPlayer.setTexture"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 7d87425..dd619cf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10058,6 +10058,7 @@ package android.media { method public void setOnSeekCompleteListener(android.media.MediaPlayer.OnSeekCompleteListener); method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener); method public void setScreenOnWhilePlaying(boolean); + method public void setTexture(android.graphics.SurfaceTexture); method public void setVolume(float, float); method public void setWakeMode(android.content.Context, int); method public void start() throws java.lang.IllegalStateException; diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 84f588e..0e161a8 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -628,9 +628,11 @@ public class MediaPlayer * and cannot be directly compared between different media sources or different * instances of the same media source, or across multiple runs of the same * program. - * @hide */ public void setTexture(SurfaceTexture st) { + if (mScreenOnWhilePlaying && st != null && mSurfaceTexture == null) { + Log.w(TAG, "setScreenOnWhilePlaying(true) is ineffective for SurfaceTexture"); + } mSurfaceHolder = null; mSurface = null; mSurfaceTexture = st; @@ -960,6 +962,9 @@ public class MediaPlayer */ public void setScreenOnWhilePlaying(boolean screenOn) { if (mScreenOnWhilePlaying != screenOn) { + if (screenOn && mSurfaceTexture != null) { + Log.w(TAG, "setScreenOnWhilePlaying(true) is ineffective for SurfaceTexture"); + } mScreenOnWhilePlaying = screenOn; updateSurfaceScreenOn(); } |