bug:
9072051
Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
jclass clazz = env->GetObjectClass(thiz);
if (clazz == NULL) {
ALOGE("Can't find android/media/MediaDrm");
jclass clazz = env->GetObjectClass(thiz);
if (clazz == NULL) {
ALOGE("Can't find android/media/MediaDrm");
- jniThrowException(env, "java/lang/Exception", NULL);
+ jniThrowException(env, "java/lang/Exception",
+ "Can't find android/media/MediaDrm");
return;
}
mClass = (jclass)env->NewGlobalRef(clazz);
return;
}
mClass = (jclass)env->NewGlobalRef(clazz);
if (entry) {
jobject obj = env->CallObjectMethod(entry, gFields.entry.getKey);
if (!env->IsInstanceOf(obj, clazz)) {
if (entry) {
jobject obj = env->CallObjectMethod(entry, gFields.entry.getKey);
if (!env->IsInstanceOf(obj, clazz)) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "HashMap key is not a String");
}
jstring jkey = static_cast<jstring>(obj);
obj = env->CallObjectMethod(entry, gFields.entry.getValue);
if (!env->IsInstanceOf(obj, clazz)) {
}
jstring jkey = static_cast<jstring>(obj);
obj = env->CallObjectMethod(entry, gFields.entry.getValue);
if (!env->IsInstanceOf(obj, clazz)) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "HashMap value is not a String");
}
jstring jvalue = static_cast<jstring>(obj);
}
jstring jvalue = static_cast<jstring>(obj);
static bool CheckSession(JNIEnv *env, const sp<IDrm> &drm, jbyteArray const &jsessionId)
{
if (drm == NULL) {
static bool CheckSession(JNIEnv *env, const sp<IDrm> &drm, jbyteArray const &jsessionId)
{
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException", "MediaDrm obj is null");
return false;
}
if (jsessionId == NULL) {
return false;
}
if (jsessionId == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException", "sessionId is null");
return false;
}
return true;
return false;
}
return true;
jobject weak_this, jbyteArray uuidObj) {
if (uuidObj == NULL) {
jobject weak_this, jbyteArray uuidObj) {
if (uuidObj == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException", "uuid is null");
return;
}
Vector<uint8_t> uuid = JByteArrayToVector(env, uuidObj);
if (uuid.size() != 16) {
return;
}
Vector<uint8_t> uuid = JByteArrayToVector(env, uuidObj);
if (uuid.size() != 16) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "invalid UUID size, expected 16 bytes");
jniThrowException(
env,
"java/lang/IllegalArgumentException",
jniThrowException(
env,
"java/lang/IllegalArgumentException",
+ "invalid UUID size, expected 16 bytes");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
Vector<uint8_t> sessionId(JByteArrayToVector(env, jsessionId));
if (jresponse == NULL) {
Vector<uint8_t> sessionId(JByteArrayToVector(env, jsessionId));
if (jresponse == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "key response is null");
return NULL;
}
Vector<uint8_t> response(JByteArrayToVector(env, jresponse));
return NULL;
}
Vector<uint8_t> response(JByteArrayToVector(env, jresponse));
sp<IDrm> drm = GetDrm(env, thiz);
if (jkeysetId == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (jkeysetId == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "keySetId is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
return;
}
if (jresponse == NULL) {
return;
}
if (jresponse == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "provision response is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
return NULL;
}
if (jname == NULL) {
return NULL;
}
if (jname == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "property name String is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
return NULL;
}
if (jname == NULL) {
return NULL;
}
if (jname == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "property name String is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
- if (jname == NULL || jvalue == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ if (jname == NULL) {
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "property name String is null");
+ return;
+ }
+
+ if (jvalue == NULL) {
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "property value String is null");
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
sp<IDrm> drm = GetDrm(env, thiz);
if (drm == NULL) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "MediaDrm obj is null");
- if (jname == NULL || jvalue == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ if (jname == NULL) {
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "property name String is null");
+ return;
+ }
+
+ if (jvalue == NULL) {
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "property value byte array is null");
}
if (jalgorithm == NULL) {
}
if (jalgorithm == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "algorithm String is null");
}
if (jalgorithm == NULL) {
}
if (jalgorithm == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "algorithm String is null");
}
if (jkeyId == NULL || jinput == NULL || jiv == NULL) {
}
if (jkeyId == NULL || jinput == NULL || jiv == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "required argument is null");
}
if (jkeyId == NULL || jinput == NULL || jiv == NULL) {
}
if (jkeyId == NULL || jinput == NULL || jiv == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "required argument is null");
}
if (jkeyId == NULL || jmessage == NULL) {
}
if (jkeyId == NULL || jmessage == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "required argument is null");
}
if (jkeyId == NULL || jmessage == NULL || jsignature == NULL) {
}
if (jkeyId == NULL || jmessage == NULL || jsignature == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "required argument is null");