summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-14 17:41:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-14 17:41:42 -0700
commit1b99cc90afffbda6013ebbb45d64f17b1d90b9f5 (patch)
treef344bfd9ff7303811c63d81812d8e084fb805675 /include/drm
parent3e67eeb5c710bcf00d4cd4d6105a0b5f7ee3007e (diff)
parent1444c94bfa6abc6516691580c360565ce18696d4 (diff)
downloadframeworks_av-1b99cc90afffbda6013ebbb45d64f17b1d90b9f5.zip
frameworks_av-1b99cc90afffbda6013ebbb45d64f17b1d90b9f5.tar.gz
frameworks_av-1b99cc90afffbda6013ebbb45d64f17b1d90b9f5.tar.bz2
am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b': For issue 4082089 Add more info and error events into the DRM framework
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/DrmInfoEvent.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/drm/DrmInfoEvent.h b/include/drm/DrmInfoEvent.h
index 7b409ff..add33d3 100644
--- a/include/drm/DrmInfoEvent.h
+++ b/include/drm/DrmInfoEvent.h
@@ -43,6 +43,8 @@ public:
//! TYPE_ACCOUNT_ALREADY_REGISTERED, when registration has been
//! already done for the given account.
static const int TYPE_ACCOUNT_ALREADY_REGISTERED = 5;
+ //! TYPE_RIGHTS_REMOVED, when the rights has been removed.
+ static const int TYPE_RIGHTS_REMOVED = 6;
/**
* The following constant values should be in sync with DrmErrorEvent.java
@@ -61,6 +63,11 @@ public:
static const int TYPE_NO_INTERNET_CONNECTION = 2005;
//! TYPE_PROCESS_DRM_INFO_FAILED, when failed to process DrmInfo.
static const int TYPE_PROCESS_DRM_INFO_FAILED = 2006;
+ //! TYPE_REMOVE_ALL_RIGHTS_FAILED, when failed to remove all the rights objects
+ //! associated with all DRM schemes.
+ static const int TYPE_REMOVE_ALL_RIGHTS_FAILED = 2007;
+ //! TYPE_ACQUIRE_DRM_INFO_FAILED, when failed to acquire DrmInfo.
+ static const int TYPE_ACQUIRE_DRM_INFO_FAILED = 2008;
public:
/**