diff options
| author | Gloria Wang <gwang@google.com> | 2011-05-13 14:02:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 14:02:50 -0700 |
| commit | 7d334602168523e3baf3aab92310c566841ca035 (patch) | |
| tree | ac6fb5ed4525dbffa87cec597271163e3323ab53 /include | |
| parent | 65f47d88107b2e34e4bab1f5208bff3f73ce4e8a (diff) | |
| parent | eea8c02bc8361be7807be969f24abeadf482fa19 (diff) | |
| download | frameworks_base-7d334602168523e3baf3aab92310c566841ca035.zip frameworks_base-7d334602168523e3baf3aab92310c566841ca035.tar.gz frameworks_base-7d334602168523e3baf3aab92310c566841ca035.tar.bz2 | |
Merge "Add one more DRM error code. For bug 4422428."
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_framework_common.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MediaErrors.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_framework_common.h b/include/drm/drm_framework_common.h index 3330ebc..2632cbd 100644 --- a/include/drm/drm_framework_common.h +++ b/include/drm/drm_framework_common.h @@ -42,6 +42,7 @@ enum { DRM_ERROR_DECRYPT_UNIT_NOT_INITIALIZED = ERROR_BASE - 4, DRM_ERROR_DECRYPT = ERROR_BASE - 5, DRM_ERROR_CANNOT_HANDLE = ERROR_BASE - 6, + DRM_ERROR_TAMPER_DETECTED = ERROR_BASE - 7, DRM_NO_ERROR = NO_ERROR }; diff --git a/include/media/stagefright/MediaErrors.h b/include/media/stagefright/MediaErrors.h index 7cc993c..21d00b8 100644 --- a/include/media/stagefright/MediaErrors.h +++ b/include/media/stagefright/MediaErrors.h @@ -52,6 +52,7 @@ enum { ERROR_DRM_DECRYPT_UNIT_NOT_INITIALIZED = DRM_ERROR_BASE - 4, ERROR_DRM_DECRYPT = DRM_ERROR_BASE - 5, ERROR_DRM_CANNOT_HANDLE = DRM_ERROR_BASE - 6, + ERROR_DRM_TAMPER_DETECTED = DRM_ERROR_BASE - 7, // Heartbeat Error Codes HEARTBEAT_ERROR_BASE = -3000, |