diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-03 11:39:04 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-11-03 11:39:04 -0700 |
| commit | b251f75d5ca3fa19cfe8a284717e00dec31f18ea (patch) | |
| tree | edb48bc69001ca3ef96bf072d71441bc8a60d547 /include/drm/DrmInfoEvent.h | |
| parent | bf3122eed31cd24acdf5cfd25541db0beb77e6f0 (diff) | |
| parent | 3041096d137144d9d1ebdd6df88ebe8e85133c05 (diff) | |
| download | frameworks_av-b251f75d5ca3fa19cfe8a284717e00dec31f18ea.zip frameworks_av-b251f75d5ca3fa19cfe8a284717e00dec31f18ea.tar.gz frameworks_av-b251f75d5ca3fa19cfe8a284717e00dec31f18ea.tar.bz2 | |
resolved conflicts for merge of a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
Diffstat (limited to 'include/drm/DrmInfoEvent.h')
| -rw-r--r-- | include/drm/DrmInfoEvent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/DrmInfoEvent.h b/include/drm/DrmInfoEvent.h index c722bd3..7b409ff 100644 --- a/include/drm/DrmInfoEvent.h +++ b/include/drm/DrmInfoEvent.h @@ -59,8 +59,8 @@ public: //! 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 = 2005; - //! TYPE_REGISTRATION_FAILED, when registration with server failed. - static const int TYPE_REGISTRATION_FAILED = 2006; + //! TYPE_PROCESS_DRM_INFO_FAILED, when failed to process DrmInfo. + static const int TYPE_PROCESS_DRM_INFO_FAILED = 2006; public: /** |