diff options
| author | Gloria Wang <gwang@google.com> | 2011-04-29 15:26:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-29 15:26:18 -0700 |
| commit | a092c0a095ed3f49e367e2f132ddb27525fb0e57 (patch) | |
| tree | c31894af54e1767278fa9d7ff856753f8c6ca68d /media/libstagefright/AwesomePlayer.cpp | |
| parent | 42e87b4e5da8c71639d05d35832c9f5e9895a9ce (diff) | |
| parent | 7340743ce30766af6334bbd9acf813eb66dd5a60 (diff) | |
| download | frameworks_av-a092c0a095ed3f49e367e2f132ddb27525fb0e57.zip frameworks_av-a092c0a095ed3f49e367e2f132ddb27525fb0e57.tar.gz frameworks_av-a092c0a095ed3f49e367e2f132ddb27525fb0e57.tar.bz2 | |
Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156."
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 1bfdd8e..70b3fbd 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -312,7 +312,7 @@ status_t AwesomePlayer::setDataSource_l( if (mDecryptHandle != NULL) { CHECK(mDrmManagerClient); if (RightsStatus::RIGHTS_VALID != mDecryptHandle->status) { - notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); + notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_DRM_NO_LICENSE); } } @@ -1801,7 +1801,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { if (mDecryptHandle != NULL) { CHECK(mDrmManagerClient); if (RightsStatus::RIGHTS_VALID != mDecryptHandle->status) { - notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); + notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_DRM_NO_LICENSE); } } |