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

Commit dc7eaa0b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cast ApkAssets to uintptr_t before jlong" into sc-dev

parents d0d61680 1d46f4f2

core/jni/android_content_res_ApkAssets.cpp

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void NativeDestroy(void* ptr) { 
}



static jlong NativeGetFinalizer(JNIEnv* /*env*/, jclass /*clazz*/) {

  return reinterpret_cast<jlong>(&NativeDestroy);

  return static_cast<jlong>(reinterpret_cast<uintptr_t>(&NativeDestroy));

}



static jstring NativeGetAssetPath(JNIEnv* env, jclass /*clazz*/, jlong ptr) {