commit 281ceee2770bbdc283ae64362b3e1c279ca5533b
author Dave Burke <daveburke@google.com> Mon Oct 13 23:00:51 2014 -0700
committer Dave Burke <daveburke@google.com> Mon Oct 13 23:00:51 2014 -0700
tree f3426a46091867213f8504a4c856a72ad3c438fc
parent be73a38f91504518c0a397aa3bbfb60ad1eff804

Revert fix for b/17673317 which causes HDCP issues.

Bug: 17967386
Change-Id: I63857e6cc20aee4ff6b67a502c41490f4cb1f98d

common/devices/ExternalDevice.cpp

diff --git a/common/devices/ExternalDevice.cpp b/common/devices/ExternalDevice.cpp
index a52c59a..2430c15 100755
--- a/common/devices/ExternalDevice.cpp
+++ b/common/devices/ExternalDevice.cpp
@@ -242,10 +242,18 @@
     if (mConnected == false) {
         mHotplugEventPending = false;
         mHdcpControl->stopHdcp();
+        mHwc.hotplug(mType, mConnected);
     } else {
-        mHdcpControl->startHdcp();
+        DLOGTRACE("start HDCP asynchronously...");
+        // delay sending hotplug event till HDCP is authenticated.
+        mHotplugEventPending = true;
+        ret = mHdcpControl->startHdcpAsync(HdcpLinkStatusListener, this);
+        if (ret == false) {
+            ELOGTRACE("failed to start HDCP");
+            mHotplugEventPending = false;
+            mHwc.hotplug(mType, mConnected);
+        }
     }
-    mHwc.hotplug(mType, mConnected);
     mActiveDisplayConfig = 0;
 }