diff --git a/proprietary/wvm/WVMMediaSource.cpp b/proprietary/wvm/WVMMediaSource.cpp
index 5a02068c..410baed9 100644
--- a/proprietary/wvm/WVMMediaSource.cpp
+++ b/proprietary/wvm/WVMMediaSource.cpp
@@ -8,7 +8,6 @@
 #include "WVMMediaSource.h"
 #include "WVMFileSource.h"
 #include "WVMExtractorImpl.h"
-#include "WVMErrorCodes.h"
 #include "media/stagefright/foundation/ADebug.h"
 #include "media/stagefright/MediaErrors.h"
 #include "media/stagefright/MediaDefs.h"
@@ -268,35 +267,26 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
 
             status_t status;
 
-            switch(result) {
-            case WV_Status_End_Of_Media:
-                status = ERROR_END_OF_STREAM;
-                break;
-            case WV_Status_Terminate_Requested:
-                status = ERROR_HEARTBEAT_TERMINATE_REQUESTED;
-                break;
-            case YT_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT:
-                status = ERROR_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT;
-                break;
-            case YT_HEARTBEAT_CONCURRENT_PLAYBACK:
-                status = ERROR_HEARTBEAT_CONCURRENT_PLAYBACK;
-                break;
-            case YT_HEARTBEAT_UNUSUAL_ACTIVITY:
-                status = ERROR_HEARTBEAT_UNUSUAL_ACTIVITY;
-                break;
-            case YT_HEARTBEAT_STREAMING_UNAVAILABLE:
-                status = ERROR_HEARTBEAT_STREAMING_UNAVAILABLE;
-                break;
-            case YT_HEARTBEAT_CANNOT_ACTIVATE_RENTAL:
-                status = ERROR_HEARTBEAT_CANNOT_ACTIVATE_RENTAL;
-                break;
-            default:
-                if (mLogOnce) {
-                    ALOGE("WV_GetEsData returned ERROR %d in WVMMediaSource::read\n", result);
-                    mLogOnce = false;
+            if (result >= WV_Status_Min_TP_Error && result <= WV_Status_Max_TP_Error) {
+                // handle the third party error code range by mapping to a reserved
+                // vendor defined range of media player error codes
+                status = ERROR_DRM_WV_VENDOR_MIN + result - WV_Status_Min_TP_Error;
+            } else {
+                switch(result) {
+                case WV_Status_End_Of_Media:
+                    status = ERROR_END_OF_STREAM;
+                    break;
+                case WV_Status_Terminate_Requested:
+                    status = ERROR_HEARTBEAT_TERMINATE_REQUESTED;
+                    break;
+                default:
+                    if (mLogOnce) {
+                        ALOGE("WV_GetEsData returned ERROR %d in WVMMediaSource::read\n", result);
+                        mLogOnce = false;
+                    }
+                    status = ERROR_IO;
+                    break;
                 }
-                status = ERROR_IO;
-                break;
             }
 
             mediaBuf->release();
diff --git a/proprietary/wvm/include/WVMErrorCodes.h b/proprietary/wvm/include/WVMErrorCodes.h
deleted file mode 100644
index 3aefae39..00000000
--- a/proprietary/wvm/include/WVMErrorCodes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-enum {
-    // YouTube Heartbeat error codes
-    YT_HEARTBEAT_CANNOT_AUTHENTICATE                    = 513,
-    YT_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT           = 514,
-    YT_HEARTBEAT_CONCURRENT_PLAYBACK                    = 515,
-    YT_HEARTBEAT_UNUSUAL_ACTIVITY                       = 516,
-    YT_HEARTBEAT_STREAMING_UNAVAILABLE                  = 517,
-    YT_HEARTBEAT_CANNOT_ACTIVATE_RENTAL                 = 518,
-};