summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-05-13 14:02:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-13 14:02:50 -0700
commit6b25afcd9df2f1f0cc3ae03bf133f75464910560 (patch)
treeb3f8d9ff7cdd026bafe6b34533fd59b8172f3350 /include
parent6708b9a3fb654f5623ba5a696288fdba310a5e1a (diff)
parent5c26937264d9748a3db2a554c188e517523aa31a (diff)
downloadframeworks_av-6b25afcd9df2f1f0cc3ae03bf133f75464910560.zip
frameworks_av-6b25afcd9df2f1f0cc3ae03bf133f75464910560.tar.gz
frameworks_av-6b25afcd9df2f1f0cc3ae03bf133f75464910560.tar.bz2
Merge "Add one more DRM error code. For bug 4422428."
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_framework_common.h1
-rw-r--r--include/media/stagefright/MediaErrors.h1
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,