commit f15cb4472aaca54c13f8250e4c7872470c4bed83
author Jeff Tinker <jtinker@google.com> Wed Apr 04 10:17:01 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 04 10:17:01 2012 -0700
tree 975cf1b8f7e6f505358836940d03069b92d1b48d
parent a4c5a550e2a3bc237179b8684e51718e05894492
parent 8f883be3bd1fffd4e30bc7298c34085a4055be2b

Merge "frameworks/av/media portion of removing YouTube specific error codes"

include/media/stagefright/MediaErrors.h

diff --git a/include/media/stagefright/MediaErrors.h b/include/media/stagefright/MediaErrors.h
index dd3bf28..8889520 100644
--- a/include/media/stagefright/MediaErrors.h
+++ b/include/media/stagefright/MediaErrors.h
@@ -55,16 +55,12 @@
     ERROR_DRM_CANNOT_HANDLE                 = DRM_ERROR_BASE - 6,
     ERROR_DRM_TAMPER_DETECTED               = DRM_ERROR_BASE - 7,
 
+    ERROR_DRM_WV_VENDOR_MAX                 = DRM_ERROR_BASE - 500,
+    ERROR_DRM_WV_VENDOR_MIN                 = DRM_ERROR_BASE - 999,
+
     // Heartbeat Error Codes
     HEARTBEAT_ERROR_BASE = -3000,
-
-    ERROR_HEARTBEAT_AUTHENTICATION_FAILURE                  = HEARTBEAT_ERROR_BASE,
-    ERROR_HEARTBEAT_NO_ACTIVE_PURCHASE_AGREEMENT            = HEARTBEAT_ERROR_BASE - 1,
-    ERROR_HEARTBEAT_CONCURRENT_PLAYBACK                     = HEARTBEAT_ERROR_BASE - 2,
-    ERROR_HEARTBEAT_UNUSUAL_ACTIVITY                        = HEARTBEAT_ERROR_BASE - 3,
-    ERROR_HEARTBEAT_STREAMING_UNAVAILABLE                   = HEARTBEAT_ERROR_BASE - 4,
-    ERROR_HEARTBEAT_CANNOT_ACTIVATE_RENTAL                  = HEARTBEAT_ERROR_BASE - 5,
-    ERROR_HEARTBEAT_TERMINATE_REQUESTED                     = HEARTBEAT_ERROR_BASE - 6,
+    ERROR_HEARTBEAT_TERMINATE_REQUESTED                     = HEARTBEAT_ERROR_BASE,
 };
 
 }  // namespace android