From 51bdb3669ab03e86c4f9c190fc8126d237330603 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <rtmitchell@google.com>
Date: Fri, 5 Mar 2021 22:31:11 +0000
Subject: [PATCH] Revert "Cast ApkAssets to uintptr_t before jlong"

This reverts commit 1d46f4f2dd549bb8711ed12d3c638a9fbef5a18f.

Reason for revert: Did not fix b/159041693

Change-Id: Ie06232a06027a29ccd2e71ae866200f2e9216cbe
---
 core/jni/android_content_res_ApkAssets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jni/android_content_res_ApkAssets.cpp b/core/jni/android_content_res_ApkAssets.cpp
index c7439f1b32d43..af06e2e80cec5 100644
--- a/core/jni/android_content_res_ApkAssets.cpp
+++ b/core/jni/android_content_res_ApkAssets.cpp
@@ -354,7 +354,7 @@ static void NativeDestroy(void* ptr) {
 }
 
 static jlong NativeGetFinalizer(JNIEnv* /*env*/, jclass /*clazz*/) {
-  return static_cast<jlong>(reinterpret_cast<uintptr_t>(&NativeDestroy));
+  return reinterpret_cast<jlong>(&NativeDestroy);
 }
 
 static jstring NativeGetAssetPath(JNIEnv* env, jclass /*clazz*/, jlong ptr) {