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

am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

Browse Source 
* commit '91f6aaaf2cb1c1a0cec129cec8038332de0271a8':
  MediaDrm#mNativeContext is a long, not int.
This commit is contained in:
Narayan Kamath
2013-12-19 13:04:19 +00:00
committed by Android Git Automerger
parent ee767548ba 91f6aaaf2c
commit 7bbc79fd68
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_MediaDrm.cpp
View File

@@ -491,7 +491,7 @@ static sp<JDrm> setDrm(
if (old != NULL) { if (old != NULL) {
old->decStrong(thiz); old->decStrong(thiz);
} }
env->SetIntField(thiz, gFields.context, (int)drm.get()); env->SetLongField(thiz, gFields.context, reinterpret_cast<jlong>(drm.get()));
return old; return old;
} }