diff options
author | Takeshi Aimi <aimitakeshi@gmail.com> | 2010-09-20 23:40:41 +0900 |
---|---|---|
committer | Takeshi Aimi <aimitakeshi@gmail.com> | 2010-10-04 22:14:53 +0900 |
commit | 2272ee27d9022d173b6eab45c409b3c3f57f30ec (patch) | |
tree | 42fd86597781bdf6b3795907ec1d086b0b549a5c /include/drm/DrmInfoEvent.h | |
parent | 0335b70c6cdbe96650d4bed817f9233cd8db1c6d (diff) | |
download | frameworks_av-2272ee27d9022d173b6eab45c409b3c3f57f30ec.zip frameworks_av-2272ee27d9022d173b6eab45c409b3c3f57f30ec.tar.gz frameworks_av-2272ee27d9022d173b6eab45c409b3c3f57f30ec.tar.bz2 |
Update of DRM framework.
- Change "void" type of return value to "int" for returning status.
- Add some of overloaded Java APIs which accept database Uri as input.
- Add asynchronous APIs
- Add OnEventListener and OnErrorListener for asynchronous APIs
- Disable debug log
- Change decrypt() API to accept an optional buffer needed by some of DRM schemes
Changes are incorporated by Sony Corporation.
Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c
Diffstat (limited to 'include/drm/DrmInfoEvent.h')
-rw-r--r-- | include/drm/DrmInfoEvent.h | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/include/drm/DrmInfoEvent.h b/include/drm/DrmInfoEvent.h index 5e8817c..c722bd3 100644 --- a/include/drm/DrmInfoEvent.h +++ b/include/drm/DrmInfoEvent.h @@ -27,28 +27,40 @@ class String8; */ class DrmInfoEvent { public: + /** + * The following constant values should be in sync with DrmInfoEvent.java + */ //! TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT, when registration has been //! already done by another account ID. - static const int TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT = 0x0000001; + static const int TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT = 1; //! TYPE_REMOVE_RIGHTS, when the rights needs to be removed completely. - static const int TYPE_REMOVE_RIGHTS = 0x0000002; + static const int TYPE_REMOVE_RIGHTS = 2; //! TYPE_RIGHTS_INSTALLED, when the rights are downloaded and installed ok. - static const int TYPE_RIGHTS_INSTALLED = 0x0000003; + static const int TYPE_RIGHTS_INSTALLED = 3; + //! TYPE_WAIT_FOR_RIGHTS, rights object is on it's way to phone, + //! wait before calling checkRights again + static const int TYPE_WAIT_FOR_RIGHTS = 4; + //! TYPE_ACCOUNT_ALREADY_REGISTERED, when registration has been + //! already done for the given account. + static const int TYPE_ACCOUNT_ALREADY_REGISTERED = 5; + + /** + * The following constant values should be in sync with DrmErrorEvent.java + */ //! TYPE_RIGHTS_NOT_INSTALLED, when something went wrong installing the rights - static const int TYPE_RIGHTS_NOT_INSTALLED = 0x0000004; + static const int TYPE_RIGHTS_NOT_INSTALLED = 2001; //! TYPE_RIGHTS_RENEWAL_NOT_ALLOWED, when the server rejects renewal of rights - static const int TYPE_RIGHTS_RENEWAL_NOT_ALLOWED = 0x0000005; + static const int TYPE_RIGHTS_RENEWAL_NOT_ALLOWED = 2002; //! TYPE_NOT_SUPPORTED, when answer from server can not be handled by the native agent - static const int TYPE_NOT_SUPPORTED = 0x0000006; - //! TYPE_WAIT_FOR_RIGHTS, rights object is on it's way to phone, - //! wait before calling checkRights again - static const int TYPE_WAIT_FOR_RIGHTS = 0x0000007; + static const int TYPE_NOT_SUPPORTED = 2003; //! TYPE_OUT_OF_MEMORY, when memory allocation fail during renewal. //! Can in the future perhaps be used to trigger garbage collector - static const int TYPE_OUT_OF_MEMORY = 0x0000008; + static const int TYPE_OUT_OF_MEMORY = 2004; //! TYPE_NO_INTERNET_CONNECTION, when the Internet connection is missing and no attempt //! can be made to renew rights - static const int TYPE_NO_INTERNET_CONNECTION = 0x0000009; + static const int TYPE_NO_INTERNET_CONNECTION = 2005; + //! TYPE_REGISTRATION_FAILED, when registration with server failed. + static const int TYPE_REGISTRATION_FAILED = 2006; public: /** |