From bce8866506ae291d916a7ad02bae64e92ed2c623 Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Mon, 25 Jul 2016 18:02:56 -0700 Subject: [PATCH] Use non-fast JNI for Canvas.native_drawBitmap. To avoid long GC thread suspension in the testWidgetsContainerFling jank test. (cherrypick commit efbf4efba0b006847f6d9c9b807d8cdc2d307589) Bug: 30190862 Change-Id: I63011592bd3d3e9e8536705037bbad889cb297f8 --- core/jni/android_graphics_Canvas.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp index ded4daca0707..2ab4a356e436 100644 --- a/core/jni/android_graphics_Canvas.cpp +++ b/core/jni/android_graphics_Canvas.cpp @@ -614,10 +614,10 @@ static const JNINativeMethod gMethods[] = { {"native_drawPath","!(JJJ)V", (void*) CanvasJNI::drawPath}, {"nativeDrawVertices", "!(JII[FI[FI[II[SIIJ)V", (void*)CanvasJNI::drawVertices}, {"native_drawNinePatch", "!(JJJFFFFJII)V", (void*)CanvasJNI::drawNinePatch}, - {"native_drawBitmap","!(JLandroid/graphics/Bitmap;FFJIII)V", (void*) CanvasJNI::drawBitmap}, + {"native_drawBitmap","(JLandroid/graphics/Bitmap;FFJIII)V", (void*) CanvasJNI::drawBitmap}, {"nativeDrawBitmapMatrix", "!(JLandroid/graphics/Bitmap;JJ)V", (void*)CanvasJNI::drawBitmapMatrix}, - {"native_drawBitmap","!(JLandroid/graphics/Bitmap;FFFFFFFFJII)V", (void*) CanvasJNI::drawBitmapRect}, - {"native_drawBitmap", "!(J[IIIFFIIZJ)V", (void*)CanvasJNI::drawBitmapArray}, + {"native_drawBitmap","(JLandroid/graphics/Bitmap;FFFFFFFFJII)V", (void*) CanvasJNI::drawBitmapRect}, + {"native_drawBitmap", "(J[IIIFFIIZJ)V", (void*)CanvasJNI::drawBitmapArray}, {"nativeDrawBitmapMesh", "!(JLandroid/graphics/Bitmap;II[FI[IIJ)V", (void*)CanvasJNI::drawBitmapMesh}, {"native_drawText","!(J[CIIFFIJJ)V", (void*) CanvasJNI::drawTextChars}, {"native_drawText","!(JLjava/lang/String;IIFFIJJ)V", (void*) CanvasJNI::drawTextString}, -- 2.11.0