Merge remote-tracking branch 'github/kali' into ics

Conflicts:
	libs/gui/SurfaceTextureClient.cpp
	services/surfaceflinger/Layer.cpp
	services/surfaceflinger/SurfaceTextureLayer.cpp

Change-Id: Ib353e7d86411c0a3ceb5ecdb75c40a7b7842da15

3 files changed, 7 insertions, 20 deletions

diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index a4af9ef..e8608915 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -141,12 +141,7 @@ public:
     //
     // This call may only be made while the OpenGL ES context to which the
     // target texture belongs is bound to the calling thread.
-#ifndef QCOM_HARDWARE
     status_t updateTexImage();
-#else
-    //
-    status_t updateTexImage(bool isComposition  = false);
-#endif
 
     // setBufferCountServer set the buffer count. If the client has requested
     // a buffer count using setBufferCount, the server-buffer count will
@@ -511,11 +506,7 @@ private:
     // glCopyTexSubImage to read from the texture.  This is a hack to work
     // around a GL driver limitation on the number of FBO attachments, which the
     // browser's tile cache exceeds.
-#ifdef QCOM_HARDWARE
-    GLenum mTexTarget;
-#else
     const GLenum mTexTarget;
-#endif
 
     // mFrameCounter is the free running counter, incremented for every buffer queued
     // with the surface Texture.
diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h
index 2c60993..c96f88a 100644
--- a/include/surfaceflinger/ISurfaceComposer.h
+++ b/include/surfaceflinger/ISurfaceComposer.h
@@ -133,10 +133,8 @@ public:
             const sp<ISurfaceTexture>& surface) const = 0;
 
 #ifdef QCOM_HDMI_OUT
-    //HDMI SPecific functions
-    virtual void enableHDMIOutput(int enable) = 0;
-    virtual void setActionSafeWidthRatio(float asWidthRatio) = 0;
-    virtual void setActionSafeHeightRatio(float asHeightRatio) = 0;
+    //External display specific functions
+    virtual void enableExternalDisplay(int disp_type, int enable) = 0;
 #endif
 
 };
@@ -160,9 +158,7 @@ public:
         TURN_ELECTRON_BEAM_ON,
         AUTHENTICATE_SURFACE,
 #ifdef QCOM_HDMI_OUT
-        ENABLE_HDMI_OUTPUT,
-        SET_ACTIONSAFE_WIDTH_RATIO,
-        SET_ACTIONSAFE_HEIGHT_RATIO
+        EXTERNAL_DISPLAY,
 #endif
     };
 
diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h
index 842a86b..3c7a022 100644
--- a/include/surfaceflinger/SurfaceComposerClient.h
+++ b/include/surfaceflinger/SurfaceComposerClient.h
@@ -110,13 +110,13 @@ public:
 
     //! Open a composer transaction on all active SurfaceComposerClients.
     static void openGlobalTransaction();
-        
+
     //! Close a composer transaction on all active SurfaceComposerClients.
     static void closeGlobalTransaction(bool synchronous = false);
-    
+
     //! Freeze the specified display but not transactions.
     static status_t freezeDisplay(DisplayID dpy, uint32_t flags = 0);
-        
+
     //! Resume updates on the specified display.
     static status_t unfreezeDisplay(DisplayID dpy, uint32_t flags = 0);
 
@@ -137,7 +137,7 @@ public:
 
 #ifdef QCOM_HDMI_OUT
     //HDMI SPecific functions
-    static void enableHDMIOutput(int enable);
+    static void enableExternalDisplay(int disp_type, int enable);
     static void setActionSafeWidthRatio(float asWidthRatio);
     static void setActionSafeHeightRatio(float asHeightRatio);
 #endif