am 3d18aaa2: Merge "Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004" into honeycomb-mr2

* commit '3d18aaa20712642aecb21c2df818b194ab43abe1':
  Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004

proprietary/wvm/WVMFileSource.cpp

@@ -27,7 +27,7 @@ namespace android {
 
 WVMFileSource::WVMFileSource(sp<DataSource> &dataSource)
     : mDataSource(dataSource),
-      mOffset(0)
+      mOffset(0), mLogOnce(true)
 {
 }
 
@@ -53,10 +53,14 @@ size_t WVMFileSource::Read(size_t amount, unsigned char *buffer)
     ssize_t result = mDataSource->readAt(mOffset, buffer, amount);
 
     if (result < 0) {
-        LOGE("mDataSource-readAt returned error %d\n", (int)result );
+        if (mLogOnce) {
+            LOGE("mDataSource-readAt returned error %d\n", (int)result );
+            mLogOnce = false;
+        }
         result = 0;
     } else  {
         mOffset += result;
+        mLogOnce = true;
     }
 
     return result;

proprietary/wvm/include/WVMFileSource.h

@@ -43,6 +43,7 @@ public:
 private:
     sp<DataSource> mDataSource;
     unsigned long long mOffset;
+    bool mLogOnce;
 };
 
 };