Merge "Move registration of Android Graphics JNI behind the C API." (eb977174) · Commits · e / os / android_frameworks_base

core/jni/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@ cc_library_shared {
		"android_view_InputEventReceiver.cpp",
		"android_view_InputEventSender.cpp",
		"android_view_InputQueue.cpp",
		"android_view_FrameMetricsObserver.cpp",
		"android_view_KeyCharacterMap.cpp",
		"android_view_KeyEvent.cpp",
		"android_view_MotionEvent.cpp",
		@@ -423,7 +422,9 @@ cc_library_static {
		android: {
		srcs: [ // sources that depend on android only libraries
		"android/graphics/apex/android_canvas.cpp",
		"android/graphics/apex/jni_runtime.cpp",

		"android_view_FrameMetricsObserver.cpp",
		"android_view_TextureLayer.cpp",
		"android_view_ThreadedRenderer.cpp",
		"android/graphics/BitmapRegionDecoder.cpp",

core/jni/AndroidRuntime.cpp

+3 −95

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@

		#include <android-base/macros.h>
		#include <android-base/properties.h>
		#include <android/graphics/jni_runtime.h>
		#include <binder/IBinder.h>
		#include <binder/IPCThreadState.h>
		#include <binder/IServiceManager.h>
		@@ -33,8 +34,6 @@
		#include <cutils/properties.h>
		#include <server_configurable_flags/get_flags.h>

		#include <SkGraphics.h>

		#include "jni.h"
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/JniInvocation.h>
		@@ -56,24 +55,7 @@ using android::base::GetProperty;

		extern int register_android_os_Binder(JNIEnv* env);
		extern int register_android_os_Process(JNIEnv* env);
		extern int register_android_graphics_Bitmap(JNIEnv*);
		extern int register_android_graphics_BitmapFactory(JNIEnv*);
		extern int register_android_graphics_BitmapRegionDecoder(JNIEnv*);
		extern int register_android_graphics_ByteBufferStreamAdaptor(JNIEnv* env);
		extern int register_android_graphics_Camera(JNIEnv* env);
		extern int register_android_graphics_CreateJavaOutputStreamAdaptor(JNIEnv* env);
		extern int register_android_graphics_GraphicBuffer(JNIEnv* env);
		extern int register_android_graphics_Graphics(JNIEnv* env);
		extern int register_android_graphics_ImageDecoder(JNIEnv*);
		extern int register_android_graphics_drawable_AnimatedImageDrawable(JNIEnv*);
		extern int register_android_graphics_Interpolator(JNIEnv* env);
		extern int register_android_graphics_MaskFilter(JNIEnv* env);
		extern int register_android_graphics_Movie(JNIEnv* env);
		extern int register_android_graphics_NinePatch(JNIEnv*);
		extern int register_android_graphics_PathEffect(JNIEnv* env);
		extern int register_android_graphics_Shader(JNIEnv* env);
		extern int register_android_graphics_Typeface(JNIEnv* env);
		extern int register_android_graphics_YuvImage(JNIEnv* env);

		extern int register_com_google_android_gles_jni_EGLImpl(JNIEnv* env);
		extern int register_com_google_android_gles_jni_GLImpl(JNIEnv* env);
		@@ -130,46 +112,18 @@ extern int register_android_util_StatsLog(JNIEnv* env);
		extern int register_android_util_StatsLogInternal(JNIEnv* env);
		extern int register_android_util_Log(JNIEnv* env);
		extern int register_android_util_MemoryIntArray(JNIEnv* env);
		extern int register_android_util_PathParser(JNIEnv* env);
		extern int register_android_content_StringBlock(JNIEnv* env);
		extern int register_android_content_XmlBlock(JNIEnv* env);
		extern int register_android_content_res_ApkAssets(JNIEnv* env);
		extern int register_android_graphics_Canvas(JNIEnv* env);
		extern int register_android_graphics_CanvasProperty(JNIEnv* env);
		extern int register_android_graphics_ColorFilter(JNIEnv* env);
		extern int register_android_graphics_ColorSpace(JNIEnv* env);
		extern int register_android_graphics_DrawFilter(JNIEnv* env);
		extern int register_android_graphics_FontFamily(JNIEnv* env);
		extern int register_android_graphics_Matrix(JNIEnv* env);
		extern int register_android_graphics_Paint(JNIEnv* env);
		extern int register_android_graphics_Path(JNIEnv* env);
		extern int register_android_graphics_PathMeasure(JNIEnv* env);
		extern int register_android_graphics_Picture(JNIEnv*);
		extern int register_android_graphics_Region(JNIEnv* env);
		extern int register_android_graphics_SurfaceTexture(JNIEnv* env);
		extern int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env);
		extern int register_android_graphics_drawable_VectorDrawable(JNIEnv* env);
		extern int register_android_graphics_fonts_Font(JNIEnv* env);
		extern int register_android_graphics_fonts_FontFamily(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfDocument(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfEditor(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfRenderer(JNIEnv* env);
		extern int register_android_graphics_text_MeasuredText(JNIEnv* env);
		extern int register_android_graphics_text_LineBreaker(JNIEnv *env);
		extern int register_android_view_DisplayEventReceiver(JNIEnv* env);
		extern int register_android_view_DisplayListCanvas(JNIEnv* env);
		extern int register_android_view_FrameMetricsObserver(JNIEnv* env);
		extern int register_android_view_InputApplicationHandle(JNIEnv* env);
		extern int register_android_view_InputWindowHandle(JNIEnv* env);
		extern int register_android_view_TextureLayer(JNIEnv* env);
		extern int register_android_view_RenderNode(JNIEnv* env);
		extern int register_android_view_RenderNodeAnimator(JNIEnv* env);
		extern int register_android_view_Surface(JNIEnv* env);
		extern int register_android_view_SurfaceControl(JNIEnv* env);
		extern int register_android_view_SurfaceSession(JNIEnv* env);
		extern int register_android_view_CompositionSamplingListener(JNIEnv* env);
		extern int register_android_view_TextureView(JNIEnv* env);
		extern int register_android_view_ThreadedRenderer(JNIEnv* env);
		extern int register_com_android_internal_view_animation_NativeInterpolatorFactoryHelper(JNIEnv *env);
		extern int register_android_database_CursorWindow(JNIEnv* env);
		extern int register_android_database_SQLiteConnection(JNIEnv* env);
		@@ -314,7 +268,7 @@ AndroidRuntime::AndroidRuntime(char* argBlockStart, const size_t argBlockLength)
		mArgBlockStart(argBlockStart),
		mArgBlockLength(argBlockLength)
		{
		SkGraphics::Init();
		init_android_graphics();

		// Pre-allocate enough space to hold a fair number of options.
		mOptions.setCapacity(20);
		@@ -1457,7 +1411,6 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_util_EventLog),
		REG_JNI(register_android_util_Log),
		REG_JNI(register_android_util_MemoryIntArray),
		REG_JNI(register_android_util_PathParser),
		REG_JNI(register_android_util_StatsLog),
		REG_JNI(register_android_util_StatsLogInternal),
		REG_JNI(register_android_app_admin_SecurityLog),
		@@ -1481,20 +1434,10 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_os_NativeHandle),
		REG_JNI(register_android_os_VintfObject),
		REG_JNI(register_android_os_VintfRuntimeInfo),
		REG_JNI(register_android_graphics_Canvas),
		// This needs to be before register_android_graphics_Graphics, or the latter
		// will not be able to find the jmethodID for ColorSpace.get().
		REG_JNI(register_android_graphics_ColorSpace),
		REG_JNI(register_android_graphics_Graphics),
		REG_JNI(register_android_view_DisplayEventReceiver),
		REG_JNI(register_android_view_RenderNode),
		REG_JNI(register_android_view_RenderNodeAnimator),
		REG_JNI(register_android_view_DisplayListCanvas),
		REG_JNI(register_android_view_FrameMetricsObserver),
		REG_JNI(register_android_view_InputApplicationHandle),
		REG_JNI(register_android_view_InputWindowHandle),
		REG_JNI(register_android_view_TextureLayer),
		REG_JNI(register_android_view_ThreadedRenderer),
		REG_JNI(register_android_view_Surface),
		REG_JNI(register_android_view_SurfaceControl),
		REG_JNI(register_android_view_SurfaceSession),
		@@ -1516,43 +1459,8 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_opengl_jni_GLES31Ext),
		REG_JNI(register_android_opengl_jni_GLES32),

		REG_JNI(register_android_graphics_Bitmap),
		REG_JNI(register_android_graphics_BitmapFactory),
		REG_JNI(register_android_graphics_BitmapRegionDecoder),
		REG_JNI(register_android_graphics_ByteBufferStreamAdaptor),
		REG_JNI(register_android_graphics_Camera),
		REG_JNI(register_android_graphics_CreateJavaOutputStreamAdaptor),
		REG_JNI(register_android_graphics_CanvasProperty),
		REG_JNI(register_android_graphics_ColorFilter),
		REG_JNI(register_android_graphics_DrawFilter),
		REG_JNI(register_android_graphics_FontFamily),
		REG_JNI(register_android_graphics_classes),
		REG_JNI(register_android_graphics_GraphicBuffer),
		REG_JNI(register_android_graphics_ImageDecoder),
		REG_JNI(register_android_graphics_drawable_AnimatedImageDrawable),
		REG_JNI(register_android_graphics_Interpolator),
		REG_JNI(register_android_graphics_MaskFilter),
		REG_JNI(register_android_graphics_Matrix),
		REG_JNI(register_android_graphics_Movie),
		REG_JNI(register_android_graphics_NinePatch),
		REG_JNI(register_android_graphics_Paint),
		REG_JNI(register_android_graphics_Path),
		REG_JNI(register_android_graphics_PathMeasure),
		REG_JNI(register_android_graphics_PathEffect),
		REG_JNI(register_android_graphics_Picture),
		REG_JNI(register_android_graphics_Region),
		REG_JNI(register_android_graphics_Shader),
		REG_JNI(register_android_graphics_SurfaceTexture),
		REG_JNI(register_android_graphics_Typeface),
		REG_JNI(register_android_graphics_YuvImage),
		REG_JNI(register_android_graphics_drawable_AnimatedVectorDrawable),
		REG_JNI(register_android_graphics_drawable_VectorDrawable),
		REG_JNI(register_android_graphics_fonts_Font),
		REG_JNI(register_android_graphics_fonts_FontFamily),
		REG_JNI(register_android_graphics_pdf_PdfDocument),
		REG_JNI(register_android_graphics_pdf_PdfEditor),
		REG_JNI(register_android_graphics_pdf_PdfRenderer),
		REG_JNI(register_android_graphics_text_MeasuredText),
		REG_JNI(register_android_graphics_text_LineBreaker),

		REG_JNI(register_android_database_CursorWindow),
		REG_JNI(register_android_database_SQLiteConnection),

core/jni/android/graphics/apex/include/android/graphics/jni_runtime.h

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#ifndef ANDROID_GRAPHICS_JNI_RUNTIME_H
		#define ANDROID_GRAPHICS_JNI_RUNTIME_H

		#include <jni.h>

		__BEGIN_DECLS

		void init_android_graphics();

		int register_android_graphics_classes(JNIEnv* env);

		void zygote_preload_graphics();

		__END_DECLS


		#endif // ANDROID_GRAPHICS_JNI_RUNTIME_H
		No newline at end of file

core/jni/android/graphics/apex/jni_runtime.cpp

0 → 100644

+169 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "android/graphics/jni_runtime.h"

		#include <android/log.h>
		#include <nativehelper/JNIHelp.h>
		#include <sys/cdefs.h>

		#include <EGL/egl.h>
		#include <Properties.h>
		#include <SkGraphics.h>

		#define LOG_TAG "AndroidGraphicsJNI"

		extern int register_android_graphics_Bitmap(JNIEnv*);
		extern int register_android_graphics_BitmapFactory(JNIEnv*);
		extern int register_android_graphics_BitmapRegionDecoder(JNIEnv*);
		extern int register_android_graphics_ByteBufferStreamAdaptor(JNIEnv* env);
		extern int register_android_graphics_Camera(JNIEnv* env);
		extern int register_android_graphics_CreateJavaOutputStreamAdaptor(JNIEnv* env);
		extern int register_android_graphics_Graphics(JNIEnv* env);
		extern int register_android_graphics_ImageDecoder(JNIEnv*);
		extern int register_android_graphics_drawable_AnimatedImageDrawable(JNIEnv*);
		extern int register_android_graphics_Interpolator(JNIEnv* env);
		extern int register_android_graphics_MaskFilter(JNIEnv* env);
		extern int register_android_graphics_Movie(JNIEnv* env);
		extern int register_android_graphics_NinePatch(JNIEnv*);
		extern int register_android_graphics_PathEffect(JNIEnv* env);
		extern int register_android_graphics_Shader(JNIEnv* env);
		extern int register_android_graphics_Typeface(JNIEnv* env);
		extern int register_android_graphics_YuvImage(JNIEnv* env);

		namespace android {

		extern int register_android_graphics_Canvas(JNIEnv* env);
		extern int register_android_graphics_CanvasProperty(JNIEnv* env);
		extern int register_android_graphics_ColorFilter(JNIEnv* env);
		extern int register_android_graphics_ColorSpace(JNIEnv* env);
		extern int register_android_graphics_DrawFilter(JNIEnv* env);
		extern int register_android_graphics_FontFamily(JNIEnv* env);
		extern int register_android_graphics_Matrix(JNIEnv* env);
		extern int register_android_graphics_Paint(JNIEnv* env);
		extern int register_android_graphics_Path(JNIEnv* env);
		extern int register_android_graphics_PathMeasure(JNIEnv* env);
		extern int register_android_graphics_Picture(JNIEnv*);
		extern int register_android_graphics_Region(JNIEnv* env);
		extern int register_android_graphics_SurfaceTexture(JNIEnv* env);
		extern int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env);
		extern int register_android_graphics_drawable_VectorDrawable(JNIEnv* env);
		extern int register_android_graphics_fonts_Font(JNIEnv* env);
		extern int register_android_graphics_fonts_FontFamily(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfDocument(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfEditor(JNIEnv* env);
		extern int register_android_graphics_pdf_PdfRenderer(JNIEnv* env);
		extern int register_android_graphics_text_MeasuredText(JNIEnv* env);
		extern int register_android_graphics_text_LineBreaker(JNIEnv *env);

		extern int register_android_util_PathParser(JNIEnv* env);
		extern int register_android_view_DisplayListCanvas(JNIEnv* env);
		extern int register_android_view_FrameMetricsObserver(JNIEnv* env);
		extern int register_android_view_RenderNode(JNIEnv* env);
		extern int register_android_view_TextureLayer(JNIEnv* env);
		extern int register_android_view_ThreadedRenderer(JNIEnv* env);

		#ifdef NDEBUG
		#define REG_JNI(name) { name }
		struct RegJNIRec {
		int (mProc)(JNIEnv);
		};
		#else
		#define REG_JNI(name) { name, #name }
		struct RegJNIRec {
		int (mProc)(JNIEnv);
		const char* mName;
		};
		#endif

		static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_graphics_Canvas),
		// This needs to be before register_android_graphics_Graphics, or the latter
		// will not be able to find the jmethodID for ColorSpace.get().
		REG_JNI(register_android_graphics_ColorSpace),
		REG_JNI(register_android_graphics_Graphics),
		REG_JNI(register_android_graphics_Bitmap),
		REG_JNI(register_android_graphics_BitmapFactory),
		REG_JNI(register_android_graphics_BitmapRegionDecoder),
		REG_JNI(register_android_graphics_ByteBufferStreamAdaptor),
		REG_JNI(register_android_graphics_Camera),
		REG_JNI(register_android_graphics_CreateJavaOutputStreamAdaptor),
		REG_JNI(register_android_graphics_CanvasProperty),
		REG_JNI(register_android_graphics_ColorFilter),
		REG_JNI(register_android_graphics_DrawFilter),
		REG_JNI(register_android_graphics_FontFamily),
		REG_JNI(register_android_graphics_ImageDecoder),
		REG_JNI(register_android_graphics_drawable_AnimatedImageDrawable),
		REG_JNI(register_android_graphics_Interpolator),
		REG_JNI(register_android_graphics_MaskFilter),
		REG_JNI(register_android_graphics_Matrix),
		REG_JNI(register_android_graphics_Movie),
		REG_JNI(register_android_graphics_NinePatch),
		REG_JNI(register_android_graphics_Paint),
		REG_JNI(register_android_graphics_Path),
		REG_JNI(register_android_graphics_PathMeasure),
		REG_JNI(register_android_graphics_PathEffect),
		REG_JNI(register_android_graphics_Picture),
		REG_JNI(register_android_graphics_Region),
		REG_JNI(register_android_graphics_Shader),
		REG_JNI(register_android_graphics_SurfaceTexture),
		REG_JNI(register_android_graphics_Typeface),
		REG_JNI(register_android_graphics_YuvImage),
		REG_JNI(register_android_graphics_drawable_AnimatedVectorDrawable),
		REG_JNI(register_android_graphics_drawable_VectorDrawable),
		REG_JNI(register_android_graphics_fonts_Font),
		REG_JNI(register_android_graphics_fonts_FontFamily),
		REG_JNI(register_android_graphics_pdf_PdfDocument),
		REG_JNI(register_android_graphics_pdf_PdfEditor),
		REG_JNI(register_android_graphics_pdf_PdfRenderer),
		REG_JNI(register_android_graphics_text_MeasuredText),
		REG_JNI(register_android_graphics_text_LineBreaker),

		REG_JNI(register_android_util_PathParser),
		REG_JNI(register_android_view_RenderNode),
		REG_JNI(register_android_view_DisplayListCanvas),
		REG_JNI(register_android_view_FrameMetricsObserver),
		REG_JNI(register_android_view_TextureLayer),
		REG_JNI(register_android_view_ThreadedRenderer),
		};

		} // namespace android

		void init_android_graphics() {
		SkGraphics::Init();
		}

		int register_android_graphics_classes(JNIEnv *env) {
		for (size_t i = 0; i < NELEM(android::gRegJNI); i++) {
		if (android::gRegJNI[i].mProc(env) < 0) {
		#ifndef NDEBUG
		__android_log_print(ANDROID_LOG_FATAL, LOG_TAG, "JNI Error!!! %s failed to load\n",
		android::gRegJNI[i].mName);
		#endif
		return -1;
		}
		}
		return 0;
		}

		using android::uirenderer::Properties;
		using android::uirenderer::RenderPipelineType;

		void zygote_preload_graphics() {
		if (Properties::peekRenderPipelineType() == RenderPipelineType::SkiaGL) {
		eglGetDisplay(EGL_DEFAULT_DISPLAY);
		}
		}
		No newline at end of file

core/jni/com_android_internal_os_ZygoteInit.cpp

+2 −8

Original line number	Diff line number	Diff line
		@@ -16,17 +16,13 @@

		#define LOG_TAG "Zygote"

		#include <EGL/egl.h>
		#include <Properties.h>
		#include <android/graphics/jni_runtime.h>
		#include <ui/GraphicBufferMapper.h>

		#include "core_jni_helpers.h"

		namespace {

		using android::uirenderer::Properties;
		using android::uirenderer::RenderPipelineType;

		// Shadow call stack (SCS) is a security mitigation that uses a separate stack
		// (the SCS) for return addresses. In versions of Android newer than P, the
		// compiler cooperates with the system to ensure that the SCS address is always
		@@ -64,9 +60,7 @@ void android_internal_os_ZygoteInit_nativePreloadAppProcessHALs(JNIEnv* env, jcl

		void android_internal_os_ZygoteInit_nativePreloadGraphicsDriver(JNIEnv* env, jclass) {
		ScopedSCSExit x;
		if (Properties::peekRenderPipelineType() == RenderPipelineType::SkiaGL) {
		eglGetDisplay(EGL_DEFAULT_DISPLAY);
		}
		zygote_preload_graphics();
		}

		const JNINativeMethod gMethods[] = {