commit 4b323195b2569d47c820d034717c89c619cee64b
author The Android Automerger <android-build@google.com> Tue Dec 09 06:10:32 2014 -0800
committer The Android Automerger <android-build@google.com> Tue Dec 09 06:10:32 2014 -0800
tree b394eaf80ca4471637f4f800c994b83c678fafc0
parent 338356d75562d043b80bbc9b1c8c545ab2bc656d
parent f97f5bf53d2d70285abb4f8afabfaec204830b63

merge in lmp-mr1-release history after reset to lmp-mr1-dev

ips/common/HdcpControl.cpp

diff --git a/ips/common/HdcpControl.cpp b/ips/common/HdcpControl.cpp
index b250ece..c574f03 100644
--- a/ips/common/HdcpControl.cpp
+++ b/ips/common/HdcpControl.cpp
@@ -36,7 +36,8 @@
       mStopped(true),
       mAuthenticated(false),
       mActionDelay(0),
-      mAuthRetryCount(0)
+      mAuthRetryCount(0),
+      mEnableAuthenticationLog(true)
 {
 }
 
@@ -173,9 +174,17 @@
     int fd = Hwcomposer::getInstance().getDrm()->getDrmFd();
     int ret = drmCommandNone(fd, DRM_PSB_ENABLE_HDCP);
     if (ret != 0) {
-        ELOGTRACE("failed to enable HDCP authentication");
+        if (mEnableAuthenticationLog) {
+            ELOGTRACE("failed to enable HDCP authentication");
+        } else {
+            VLOGTRACE("failed to enable HDCP authentication");
+        }
+
+        mEnableAuthenticationLog = false;
         return false;
     }
+
+    mEnableAuthenticationLog = true;
     return true;
 }
 
@@ -275,7 +284,11 @@
         }
 
         if (!enableAuthentication()) {
-            ELOGTRACE("HDCP authentication failed. Retry");
+            if (mAuthenticated)
+                ELOGTRACE("HDCP authentication failed. Retry");
+            else
+                VLOGTRACE("HDCP authentication failed. Retry");
+
             mAuthenticated = false;
             ret = true;
         } else {

ips/common/HdcpControl.h

diff --git a/ips/common/HdcpControl.h b/ips/common/HdcpControl.h
index 301ee96..350260c 100644
--- a/ips/common/HdcpControl.h
+++ b/ips/common/HdcpControl.h
@@ -76,6 +76,7 @@
     bool mAuthenticated;
     int mActionDelay;  // in milliseconds
     uint32_t mAuthRetryCount;
+    bool mEnableAuthenticationLog;
 
 private:
     DECLARE_THREAD(HdcpControlThread, HdcpControl);