summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hiroshi Yamauchi <yamauchi@google.com> 2016-07-25 18:02:56 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> 2016-07-25 18:02:56 -0700
commitbce8866506ae291d916a7ad02bae64e92ed2c623 (patch)
tree4d0abfea85b092278548dd961b728956f4a7d9c8
parentad749416991e037fe6a875fa072c5bb8ed4c0a39 (diff)
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
-rw-r--r--core/jni/android_graphics_Canvas.cpp6
1 files 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},