From c43dfdf077438d67cb2bcf3b95c4b9846a045116 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 29 Jan 2018 17:55:44 +0100 Subject: [PATCH] Surface: Fix bad casts Fixes bad reinterpret_casts to ANativeWindow* where the reinterpreted pointer is actually a Surface* Test: make droid Bug: 72492508 Change-Id: Iadc92e8e82efab26be584f5a1c83c678e4496505 --- core/jni/android_view_Surface.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 421e0de52cc0a..f5c09fd316de9 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -524,15 +524,15 @@ static jint nativeAttachAndQueueBuffer(JNIEnv *env, jclass clazz, jlong nativeOb static jint nativeSetSharedBufferModeEnabled(JNIEnv* env, jclass clazz, jlong nativeObject, jboolean enabled) { Surface* surface = reinterpret_cast(nativeObject); - return ((ANativeWindow*) nativeObject)->perform(surface, - NATIVE_WINDOW_SET_SHARED_BUFFER_MODE, enabled); + ANativeWindow* anw = static_cast(surface); + return anw->perform(surface, NATIVE_WINDOW_SET_SHARED_BUFFER_MODE, int(enabled)); } static jint nativeSetAutoRefreshEnabled(JNIEnv* env, jclass clazz, jlong nativeObject, jboolean enabled) { Surface* surface = reinterpret_cast(nativeObject); - return ((ANativeWindow*) nativeObject)->perform(surface, - NATIVE_WINDOW_SET_AUTO_REFRESH, enabled); + ANativeWindow* anw = static_cast(surface); + return anw->perform(surface, NATIVE_WINDOW_SET_AUTO_REFRESH, int(enabled)); } namespace uirenderer {