From 817c161ef27b6087c496755768d65fcb4f78f04c Mon Sep 17 00:00:00 2001
From: Glenn Kasten <gkasten@google.com>
Date: Wed, 13 Apr 2011 08:11:47 -0700
Subject: Bug 4184736 unhide MediaPlayer.setTexture

Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
---
 media/java/android/media/MediaPlayer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'media/java/android')

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();
         }
-- 
cgit v1.1