drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4d572b01: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev

Browse Source 
* commit '4d572b0134318433467b95f829545753147c0b43':
  Load crypto plugins from additional shared libraries
This commit is contained in:
Jeff Tinker
2013-03-25 20:23:00 +00:00
committed by Android Git Automerger
parent d7afbeb52a 4d572b0134
commit 6555a64fb9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/jni/android_media_MediaCrypto.cpp
View File

@ -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;
}