diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-05-06 17:22:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 17:22:55 +0000 |
| commit | eb58c6d9ee8eac81864aaecb38a1831014ebf152 (patch) | |
| tree | 842417df1ad2ffa57af8d59aa864612fd036bb67 /media | |
| parent | a0cf6c4d7d13c73feef5b88760b52b18289b0db2 (diff) | |
| parent | ceffd8cc911bd2e685b525f838cd3d8198ab35cf (diff) | |
| download | frameworks_av-eb58c6d9ee8eac81864aaecb38a1831014ebf152.zip frameworks_av-eb58c6d9ee8eac81864aaecb38a1831014ebf152.tar.gz frameworks_av-eb58c6d9ee8eac81864aaecb38a1831014ebf152.tar.bz2 | |
Merge "Pass all DRM errors through ICrypto" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index 9246a7c..2f440fe 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -142,7 +142,7 @@ struct BpCrypto : public BpInterface<ICrypto> { ssize_t result = reply.readInt32(); - if (result >= ERROR_DRM_VENDOR_MIN && result <= ERROR_DRM_VENDOR_MAX) { + if (isCryptoError(result)) { errorDetailMsg->setTo(reply.readCString()); } @@ -319,8 +319,7 @@ status_t BnCrypto::onTransact( reply->writeInt32(result); - if (result >= ERROR_DRM_VENDOR_MIN - && result <= ERROR_DRM_VENDOR_MAX) { + if (isCryptoError(result)) { reply->writeCString(errorDetailMsg.c_str()); } |