diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-08-07 01:44:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-07 01:44:38 +0000 |
| commit | 2f583c0ac819a7bbd1228d7b8c3857c7e6a98a91 (patch) | |
| tree | a142b620d9f27575b983685dbb28f131d8ab43ee /include | |
| parent | 89a70f71cef61d10437b3901e8efc1f082a857c5 (diff) | |
| parent | 362552a53523c46679e8b3cbb83b39d7ae769ff7 (diff) | |
| download | frameworks_av-2f583c0ac819a7bbd1228d7b8c3857c7e6a98a91.zip frameworks_av-2f583c0ac819a7bbd1228d7b8c3857c7e6a98a91.tar.gz frameworks_av-2f583c0ac819a7bbd1228d7b8c3857c7e6a98a91.tar.bz2 | |
Merge "Adds a drm resource busy error, removes some deprecated errors"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaErrors.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/media/stagefright/MediaErrors.h b/include/media/stagefright/MediaErrors.h index ee5e4e2..686f286 100644 --- a/include/media/stagefright/MediaErrors.h +++ b/include/media/stagefright/MediaErrors.h @@ -56,14 +56,11 @@ enum { 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_RESOURCE_BUSY = DRM_ERROR_BASE - 10, ERROR_DRM_VENDOR_MAX = DRM_ERROR_BASE - 500, ERROR_DRM_VENDOR_MIN = DRM_ERROR_BASE - 999, - // Deprecated - ERROR_DRM_WV_VENDOR_MAX = ERROR_DRM_VENDOR_MAX, - ERROR_DRM_WV_VENDOR_MIN = ERROR_DRM_VENDOR_MIN, - // Heartbeat Error Codes HEARTBEAT_ERROR_BASE = -3000, ERROR_HEARTBEAT_TERMINATE_REQUESTED = HEARTBEAT_ERROR_BASE, |