Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91f6aaaf authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

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

* commit '2d2d5943':
  MediaDrm#mNativeContext is a long, not int.
parents d9386812 2d2d5943

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;

}