diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-03-25 20:18:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-25 20:18:18 +0000 |
| commit | 4d572b0134318433467b95f829545753147c0b43 (patch) | |
| tree | 6b25c454985494d23ff7cb3ebbcb3306dea7ffda | |
| parent | f00529d901da11d98ddf4b3b06d411e6879c9591 (diff) | |
| parent | 90defba919e8e969a9963bf401a7b144d869accf (diff) | |
| download | frameworks_base-4d572b0134318433467b95f829545753147c0b43.zip frameworks_base-4d572b0134318433467b95f829545753147c0b43.tar.gz frameworks_base-4d572b0134318433467b95f829545753147c0b43.tar.bz2 | |
Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
| -rw-r--r-- | media/jni/android_media_MediaCrypto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index 517a293..d0f56ea 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -74,7 +74,7 @@ sp<ICrypto> JCrypto::MakeCrypto() { sp<ICrypto> crypto = service->makeCrypto(); - if (crypto == NULL || crypto->initCheck() != OK) { + if (crypto == NULL || (crypto->initCheck() != OK && crypto->initCheck() != NO_INIT)) { return NULL; } |