diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-04-18 00:53:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-18 00:53:55 +0000 |
| commit | 005bb86bd99077283df1968958d5c514a3bfa16a (patch) | |
| tree | ad37ce88857f21854496ad9ba717e9e4b01872df | |
| parent | 790703a1422b46fada45a1210815a6517d35b792 (diff) | |
| parent | b87d5cd72cc2ce6a85899b7a06d881fad4c39d77 (diff) | |
| download | frameworks_av-005bb86bd99077283df1968958d5c514a3bfa16a.zip frameworks_av-005bb86bd99077283df1968958d5c514a3bfa16a.tar.gz frameworks_av-005bb86bd99077283df1968958d5c514a3bfa16a.tar.bz2 | |
Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev
| -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, |