Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix JNI method called with exception pending" into klp-dev

Browse Source
This commit is contained in:
Jeff Tinker
2013-08-16 23:04:54 +00:00
committed by Android (Google) Code Review
parent d0d554579b 8117d8f702
commit df717aaa25
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media/jni/android_media_MediaDrm.cpp
View File

@@ -753,7 +753,9 @@ static jbyteArray android_media_MediaDrm_provideKeyResponse(
status_t err = drm->provideKeyResponse(sessionId, response, keySetId); status_t err = drm->provideKeyResponse(sessionId, response, keySetId);
throwExceptionAsNecessary(env, err, "Failed to handle key response"); if (throwExceptionAsNecessary(env, err, "Failed to handle key response")) {
return NULL;
}
return VectorToJByteArray(env, keySetId); return VectorToJByteArray(env, keySetId);
} }
@@ -1104,7 +1106,9 @@ static jbyteArray android_media_MediaDrm_encryptNative(
status_t err = drm->encrypt(sessionId, keyId, input, iv, output); status_t err = drm->encrypt(sessionId, keyId, input, iv, output);
throwExceptionAsNecessary(env, err, "Failed to encrypt"); if (throwExceptionAsNecessary(env, err, "Failed to encrypt")) {
return NULL;
}
return VectorToJByteArray(env, output); return VectorToJByteArray(env, output);
} }
@@ -1132,7 +1136,9 @@ static jbyteArray android_media_MediaDrm_decryptNative(
Vector<uint8_t> output; Vector<uint8_t> output;
status_t err = drm->decrypt(sessionId, keyId, input, iv, output); status_t err = drm->decrypt(sessionId, keyId, input, iv, output);
throwExceptionAsNecessary(env, err, "Failed to decrypt"); if (throwExceptionAsNecessary(env, err, "Failed to decrypt")) {
return NULL;
}
return VectorToJByteArray(env, output); return VectorToJByteArray(env, output);
} }
@@ -1160,7 +1166,9 @@ static jbyteArray android_media_MediaDrm_signNative(
status_t err = drm->sign(sessionId, keyId, message, signature); status_t err = drm->sign(sessionId, keyId, message, signature);
throwExceptionAsNecessary(env, err, "Failed to sign"); if (throwExceptionAsNecessary(env, err, "Failed to sign")) {
return NULL;
}
return VectorToJByteArray(env, signature); return VectorToJByteArray(env, signature);
} }