summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-04-29 10:44:46 -0700
committerGloria Wang <gwang@google.com>2011-04-29 11:01:36 -0700
commit7340743ce30766af6334bbd9acf813eb66dd5a60 (patch)
treec31894af54e1767278fa9d7ff856753f8c6ca68d /include/drm
parentd0675ede6de2249256d20271a19ccbf9f11745b8 (diff)
downloadframeworks_av-7340743ce30766af6334bbd9acf813eb66dd5a60.zip
frameworks_av-7340743ce30766af6334bbd9acf813eb66dd5a60.tar.gz
frameworks_av-7340743ce30766af6334bbd9acf813eb66dd5a60.tar.bz2
Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_framework_common.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/include/drm/drm_framework_common.h b/include/drm/drm_framework_common.h
index d2d1d7e..3330ebc 100644
--- a/include/drm/drm_framework_common.h
+++ b/include/drm/drm_framework_common.h
@@ -31,14 +31,17 @@ namespace android {
* Error code for DRM Frameowrk
*/
enum {
- DRM_ERROR_BASE = -2000,
-
- DRM_ERROR_UNKNOWN = DRM_ERROR_BASE,
- DRM_ERROR_LICENSE_EXPIRED = DRM_ERROR_BASE - 1,
- DRM_ERROR_SESSION_NOT_OPENED = DRM_ERROR_BASE - 2,
- DRM_ERROR_DECRYPT_UNIT_NOT_INITIALIZED = DRM_ERROR_BASE - 3,
- DRM_ERROR_DECRYPT = DRM_ERROR_BASE - 4,
- DRM_ERROR_CANNOT_HANDLE = DRM_ERROR_BASE - 5,
+ // The following constant values should be in sync with
+ // media/stagefright/MediaErrors.h
+ ERROR_BASE = -2000,
+
+ DRM_ERROR_UNKNOWN = ERROR_BASE,
+ DRM_ERROR_NO_LICENSE = ERROR_BASE - 1,
+ DRM_ERROR_LICENSE_EXPIRED = ERROR_BASE - 2,
+ DRM_ERROR_SESSION_NOT_OPENED = ERROR_BASE - 3,
+ DRM_ERROR_DECRYPT_UNIT_NOT_INITIALIZED = ERROR_BASE - 4,
+ DRM_ERROR_DECRYPT = ERROR_BASE - 5,
+ DRM_ERROR_CANNOT_HANDLE = ERROR_BASE - 6,
DRM_NO_ERROR = NO_ERROR
};