Commit ad1ff472 authored Dec 19, 2013 by Narayan Kamath Committed by Android Git Automerger Dec 19, 2013

am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge...

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

* commit '7bbc79fd':
  MediaDrm#mNativeContext is a long, not int.

parents 67fa194e 7bbc79fd

media/jni/android_media_MediaDrm.cpp

+1 −1

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

		return old;
		}