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

Fix JNI method called with exception pending

Browse Source 
bug: 10313912
Change-Id: I8390905334f2e37f210adced52c31e7a431d4f55
This commit is contained in:
Jeff Tinker
2013-08-16 13:46:02 -07:00
parent 0d8afa2ea3
commit 8117d8f702
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);
throwExceptionAsNecessary(env, err, "Failed to handle key response");
if (throwExceptionAsNecessary(env, err, "Failed to handle key response")) {
return NULL;
}
return VectorToJByteArray(env, keySetId);
}
@@ -1104,7 +1106,9 @@ static jbyteArray android_media_MediaDrm_encryptNative(
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);
}
@@ -1132,7 +1136,9 @@ static jbyteArray android_media_MediaDrm_decryptNative(
Vector<uint8_t> 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);
}
@@ -1160,7 +1166,9 @@ static jbyteArray android_media_MediaDrm_signNative(
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);
}