diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-04-17 17:59:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 17:59:31 -0700 |
| commit | 96c9b6e02b440428397591e2a36eb6af7e0fdab9 (patch) | |
| tree | b8f9ad050925b7404ab31f6f2e358331ccf28616 /include | |
| parent | 503261ce9e616b16056e54c37e1e3dfdc1077763 (diff) | |
| parent | 4d9df49a128dba70b68890c81bf172c11fd40233 (diff) | |
| download | frameworks_av-96c9b6e02b440428397591e2a36eb6af7e0fdab9.zip frameworks_av-96c9b6e02b440428397591e2a36eb6af7e0fdab9.tar.gz frameworks_av-96c9b6e02b440428397591e2a36eb6af7e0fdab9.tar.bz2 | |
am 4d9df49a: am 64595e67: Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev
* commit '4d9df49a128dba70b68890c81bf172c11fd40233':
Add new error codes for DRM to improve error reporting
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaErrors.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaErrors.h b/include/media/stagefright/MediaErrors.h index bb01467..ee5e4e2 100644 --- a/include/media/stagefright/MediaErrors.h +++ b/include/media/stagefright/MediaErrors.h @@ -54,6 +54,8 @@ enum { ERROR_DRM_DECRYPT = DRM_ERROR_BASE - 5, ERROR_DRM_CANNOT_HANDLE = DRM_ERROR_BASE - 6, ERROR_DRM_TAMPER_DETECTED = DRM_ERROR_BASE - 7, + ERROR_DRM_NOT_PROVISIONED = DRM_ERROR_BASE - 8, + ERROR_DRM_DEVICE_REVOKED = DRM_ERROR_BASE - 9, ERROR_DRM_VENDOR_MAX = DRM_ERROR_BASE - 500, ERROR_DRM_VENDOR_MIN = DRM_ERROR_BASE - 999, |