From: Dave Burke <daveburke@google.com>
Date: Thu, 11 Aug 2011 12:46:47 +0000 (+0100)
Subject: Revert "error out when SurfaceTexture APIs are called while not connected"
X-Git-Tag: android-x86-4.4-r1~5206^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4925ee11f980cdeba1166fe07a6b59ff88b25d5c;p=android-x86%2Fframeworks-native.git

Revert "error out when SurfaceTexture APIs are called while not connected"

This reverts commit a04cda9986366ab480ad8008c4d923271b05d78e.

Conflicts:

	include/gui/SurfaceTexture.h
	libs/gui/SurfaceTexture.cpp

Change-Id: Ib655016462c496ee2a27f7cb33a6e8b18cfe684a
---

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 4afca68849..7ac43431f1 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -154,10 +154,6 @@ status_t SurfaceTexture::setBufferCount(int bufferCount) {
         LOGE("setBufferCount: SurfaceTexture has been abandoned!");
         return NO_INIT;
     }
-    if (mConnectedApi == NO_CONNECTED_API) {
-        LOGE("setBufferCount: SurfaceTexture is not connected!");
-        return NO_INIT;
-    }
     if (bufferCount > NUM_BUFFER_SLOTS) {
         LOGE("setBufferCount: bufferCount larger than slots available");
         return BAD_VALUE;
@@ -217,10 +213,6 @@ status_t SurfaceTexture::requestBuffer(int slot, sp<GraphicBuffer>* buf) {
         LOGE("requestBuffer: SurfaceTexture has been abandoned!");
         return NO_INIT;
     }
-    if (mConnectedApi == NO_CONNECTED_API) {
-        LOGE("requestBuffer: SurfaceTexture is not connected!");
-        return NO_INIT;
-    }
     if (slot < 0 || mBufferCount <= slot) {
         LOGE("requestBuffer: slot index out of range [0, %d]: %d",
                 mBufferCount, slot);
@@ -252,10 +244,6 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,
             LOGE("dequeueBuffer: SurfaceTexture has been abandoned!");
             return NO_INIT;
         }
-        if (mConnectedApi == NO_CONNECTED_API) {
-            LOGE("dequeueBuffer: SurfaceTexture is not connected!");
-            return NO_INIT;
-        }
 
         // We need to wait for the FIFO to drain if the number of buffer
         // needs to change.
@@ -446,10 +434,6 @@ status_t SurfaceTexture::queueBuffer(int buf, int64_t timestamp,
             LOGE("queueBuffer: SurfaceTexture has been abandoned!");
             return NO_INIT;
         }
-        if (mConnectedApi == NO_CONNECTED_API) {
-            LOGE("queueBuffer: SurfaceTexture is not connected!");
-            return NO_INIT;
-        }
         if (buf < 0 || buf >= mBufferCount) {
             LOGE("queueBuffer: slot index out of range [0, %d]: %d",
                     mBufferCount, buf);
@@ -520,10 +504,6 @@ void SurfaceTexture::cancelBuffer(int buf) {
         LOGW("cancelBuffer: SurfaceTexture has been abandoned!");
         return;
     }
-    if (mConnectedApi == NO_CONNECTED_API) {
-        LOGE("cancelBuffer: SurfaceTexture is not connected!");
-        return;
-    }
 
     if (buf < 0 || buf >= mBufferCount) {
         LOGE("cancelBuffer: slot index out of range [0, %d]: %d",
@@ -545,10 +525,6 @@ status_t SurfaceTexture::setCrop(const Rect& crop) {
         LOGE("setCrop: SurfaceTexture has been abandoned!");
         return NO_INIT;
     }
-    if (mConnectedApi == NO_CONNECTED_API) {
-        LOGE("setCrop: SurfaceTexture is not connected!");
-        return NO_INIT;
-    }
     mNextCrop = crop;
     return OK;
 }
@@ -560,10 +536,6 @@ status_t SurfaceTexture::setTransform(uint32_t transform) {
         LOGE("setTransform: SurfaceTexture has been abandoned!");
         return NO_INIT;
     }
-    if (mConnectedApi == NO_CONNECTED_API) {
-        LOGE("setTransform: SurfaceTexture is not connected!");
-        return NO_INIT;
-    }
     mNextTransform = transform;
     return OK;
 }