summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2012-04-03 16:11:51 -0700
committerJeff Tinker <jtinker@google.com>2012-04-03 16:11:51 -0700
commit8f883be3bd1fffd4e30bc7298c34085a4055be2b (patch)
treebf827e7e33a3094d61978b9020e6522cb5ffd731 /include
parentb4c0c4b800332fe55c60aa328ece8d849cee3a4d (diff)
downloadframeworks_av-8f883be3bd1fffd4e30bc7298c34085a4055be2b.zip
frameworks_av-8f883be3bd1fffd4e30bc7298c34085a4055be2b.tar.gz
frameworks_av-8f883be3bd1fffd4e30bc7298c34085a4055be2b.tar.bz2
frameworks/av/media portion of removing YouTube specific error codes
Change-Id: Id0d84d3aaaf340cd5287611c9dc7cb8d11466772 related-to-bug: 5883949
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MediaErrors.h12
1 files changed, 4 insertions, 8 deletions
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 @@ enum {
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