surfaceflinger: call perform function with custom events to HAL

- SF will call perform with event and value to inform HALS about
  custom events(external display, orientation change etc.,)
- remove actionsafe related functions.

CRs-Fixed: 341947
(cherry picked from commit ca1e7b9ee353bc4d2fdc2234d8860e84bbff74f1)

Change-Id: Icfe5f2f8ce56561c6959e206771b2850a3597e70

6 files changed, 6 insertions, 28 deletions

diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
index d2bf267..5b96587 100755
--- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
@@ -421,16 +421,6 @@ void DisplayHardware::dump(String8& res) const
 #ifdef QCOM_HDMI_OUT
 void DisplayHardware::orientationChanged(int orientation) const
 {
-    mNativeWindow->orientationChanged(orientation);
-}
-
-void DisplayHardware::setActionSafeWidthRatio(float asWidthRatio) const
-{
-    mNativeWindow->setActionSafeWidthRatio(asWidthRatio);
-}
-
-void DisplayHardware::setActionSafeHeightRatio(float asHeightRatio) const
-{
-    mNativeWindow->setActionSafeHeightRatio(asHeightRatio);
+    mNativeWindow->orientationChanged(EVENT_ORIENTATION_CHANGE, orientation);
 }
 #endif
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index f3c854e..34de259 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -227,9 +227,9 @@ void HWComposer::dump(String8& result, char* buffer, size_t SIZE,
 }
 
 #ifdef QCOM_HDMI_OUT
-void HWComposer::enableHDMIOutput(bool enable) {
+void HWComposer::perform(int event, int value) {
     if (mHwc) {
-        mHwc->enableHDMIOutput(mHwc, enable);
+        mHwc->perform(mHwc, event, value);
     }
 }
 #endif
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h
index b31dbbf..b155d42 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -72,7 +72,7 @@ public:
     uint32_t getFlags() const;
 #endif
 #ifdef QCOM_HDMI_OUT
-    void enableHDMIOutput(bool enable);
+    void perform(int event, int value);
 #endif
 
     // for debugging
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 83ffb4e..14e2fa0 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1402,7 +1402,7 @@ void SurfaceFlinger::updateHwcExternalDisplay(int externaltype)
     const DisplayHardware& hw(graphicPlane(0).displayHardware());
     mDirtyRegion.set(hw.bounds());
     HWComposer& hwc(hw.getHwComposer());
-    hwc.enableHDMIOutput(externaltype);
+    hwc.perform(EVENT_EXTERNAL_DISPLAY, externaltype);
 }
 
 /*
@@ -1422,16 +1422,6 @@ void SurfaceFlinger::enableExternalDisplay(int disp_type, int value)
         signalEvent();
     }
 }
-
-void SurfaceFlinger::setActionSafeWidthRatio(float asWidthRatio){
-    const DisplayHardware& hw(graphicPlane(0).displayHardware());
-    hw.setActionSafeWidthRatio(asWidthRatio);
-}
-
-void SurfaceFlinger::setActionSafeHeightRatio(float asHeightRatio){
-    const DisplayHardware& hw(graphicPlane(0).displayHardware());
-    hw.setActionSafeHeightRatio(asHeightRatio);
-}
 #endif
 
 sp<ISurface> SurfaceFlinger::createSurface(
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 3406bb3..b7a60f6 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -185,8 +185,6 @@ public:
 #ifdef QCOM_HDMI_OUT
     //HDMI Specific
     virtual void                        enableExternalDisplay(int disp_type, int externaltype);
-    virtual void                        setActionSafeWidthRatio(float asWidthRatio);
-    virtual void                        setActionSafeHeightRatio(float asHeightRatio);
 #endif
 
     virtual status_t captureScreen(DisplayID dpy,
diff --git a/services/surfaceflinger/SurfaceTextureLayer.cpp b/services/surfaceflinger/SurfaceTextureLayer.cpp
index bef8b79..7ee6f63 100644
--- a/services/surfaceflinger/SurfaceTextureLayer.cpp
+++ b/services/surfaceflinger/SurfaceTextureLayer.cpp
@@ -127,7 +127,7 @@ status_t SurfaceTextureLayer::connect(int api,
 #endif
                 // fall through to set synchronous mode when not defaulting to
                 // async mode.
-            deafult:
+            default:
                 err = setSynchronousMode(true);
                 break;
         }