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

am 37109819: am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"

Browse Source 
* commit '37109819d05495184bfcfaea91453d325828ab0b':
  Cast CallMethod's size_t parameters to jint
This commit is contained in:
Narayan Kamath
2014-03-31 10:00:32 +00:00
committed by Android Git Automerger
parent 40bd6ccdf2 37109819d0
commit 1d039e8982
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_MediaExtractor.cpp
View File

@@ -87,7 +87,7 @@ class JavaDataSourceBridge : public DataSource {
jbyteArray byteArrayObj = env->NewByteArray(size);
env->DeleteLocalRef(env->GetObjectClass(mDataSource));
env->DeleteLocalRef(env->GetObjectClass(byteArrayObj));
ssize_t numread = env->CallIntMethod(mDataSource, mReadMethod, offset, byteArrayObj, size);
ssize_t numread = env->CallIntMethod(mDataSource, mReadMethod, offset, byteArrayObj, (jint)size);
env->GetByteArrayRegion(byteArrayObj, 0, size, (jbyte*) buffer);
env->DeleteLocalRef(byteArrayObj);
if (env->ExceptionCheck()) {
@@ -632,7 +632,7 @@ static jboolean android_media_MediaExtractor_getSampleCryptoInfo(
env->CallVoidMethod(
cryptoInfoObj,
gFields.cryptoInfoSetID,
numSubSamples,
(jint)numSubSamples,
numBytesOfPlainDataObj,
numBytesOfEncryptedDataObj,
keyObj,