Fix video flash issue at the end of playing video.

BZ:141685

MDS calls HWC to disable overlay when enter into unpreparing state.
This will make video window to be black, which is not expected.
For protected video, operations on overlay plane will not change,
For clear video, overlay will not be disabled in unpreparing state.

Change-Id: I525fd03f9870b82588d6b89ab004e2ddafcc7597
Signed-off-by: mahongpe <mahongpe@intel.com>
Signed-off-by: Andy Qiu <junhai.qiu@intel.com>

2 files changed, 4 insertions, 11 deletions

diff --git a/common/observers/MultiDisplayObserver.cpp b/common/observers/MultiDisplayObserver.cpp
index e68d3ab..b3d142e 100644
--- a/common/observers/MultiDisplayObserver.cpp
+++ b/common/observers/MultiDisplayObserver.cpp
@@ -307,11 +307,8 @@ status_t MultiDisplayObserver::blankSecondaryDisplay(bool blank)
 
 status_t MultiDisplayObserver::updateVideoState(int sessionId, MDS_VIDEO_STATE state)
 {
-    bool preparing = (state == MDS_VIDEO_PREPARING || state == MDS_VIDEO_UNPREPARING);
-    bool playing = (state != MDS_VIDEO_UNPREPARED);
-    VTRACE("video state: preparing %d, playing %d", preparing, playing);
     Hwcomposer::getInstance().getDisplayAnalyzer()->postVideoEvent(
-        sessionId, preparing, playing);
+        sessionId, (int)state);
     return 0;
 }
 
@@ -335,17 +332,13 @@ status_t MultiDisplayObserver::setHdmiTiming(const MDSHdmiTiming& timing)
 
 /// Public interfaces
 
-status_t MultiDisplayObserver::notifyHotPlug(int disp, bool connected)
+status_t MultiDisplayObserver::notifyHotPlug( bool connected)
 {
     Mutex::Autolock _l(mLock);
     if (mMDSConnObserver.get() == NULL) {
         return NO_INIT;
     }
 
-    if (disp != IDisplayDevice::DEVICE_EXTERNAL) {
-        WTRACE("Only hanlding external display hotplug");
-        return NO_ERROR;
-    }
     if (connected == mDeviceConnected) {
         WTRACE("hotplug event ignored");
         return NO_ERROR;
diff --git a/common/observers/MultiDisplayObserver.h b/common/observers/MultiDisplayObserver.h
index 8563b54..86cd988 100644
--- a/common/observers/MultiDisplayObserver.h
+++ b/common/observers/MultiDisplayObserver.h
@@ -74,7 +74,7 @@ public:
 public:
     bool initialize();
     void deinitialize();
-    status_t notifyHotPlug(int disp, bool connected);
+    status_t notifyHotPlug(bool connected);
     status_t getVideoSourceInfo(int sessionID, VideoSourceInfo* info);
     int  getVideoSessionNumber();
     bool isExternalDeviceTimingFixed() const;
@@ -123,7 +123,7 @@ public:
 
     bool initialize() { return true; }
     void deinitialize() {}
-    status_t notifyHotPlug(int disp, bool connected) { return NO_ERROR; }
+    status_t notifyHotPlug(bool connected) { return NO_ERROR; }
     status_t getVideoSourceInfo(int sessionID, VideoSourceInfo* info) { return INVALID_OPERATION; }
     int  getVideoSessionNumber() { return 0; }
     bool isExternalDeviceTimingFixed() const { return false; }