diff options
| author | Jeff Tinker <jtinker@google.com> | 2012-04-04 10:17:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-04 10:17:01 -0700 |
| commit | f15cb4472aaca54c13f8250e4c7872470c4bed83 (patch) | |
| tree | 975cf1b8f7e6f505358836940d03069b92d1b48d | |
| parent | a4c5a550e2a3bc237179b8684e51718e05894492 (diff) | |
| parent | 8f883be3bd1fffd4e30bc7298c34085a4055be2b (diff) | |
| download | frameworks_av-f15cb4472aaca54c13f8250e4c7872470c4bed83.zip frameworks_av-f15cb4472aaca54c13f8250e4c7872470c4bed83.tar.gz frameworks_av-f15cb4472aaca54c13f8250e4c7872470c4bed83.tar.bz2 | |
Merge "frameworks/av/media portion of removing YouTube specific error codes"
| -rw-r--r-- | include/media/stagefright/MediaErrors.h | 12 |
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 |