diff options
| author | John Reck <jreck@google.com> | 2015-04-13 15:20:29 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-04-30 14:34:55 -0700 |
| commit | 3731dc220ed457e0f1e99d7ec2589e0a43872b59 (patch) | |
| tree | 2defd2b50881d20db99296b25e3da7c59ac48de0 /services/core/jni | |
| parent | ed207b92747234eac88dd3664ecfb535e45d8ed1 (diff) | |
| download | frameworks_base-3731dc220ed457e0f1e99d7ec2589e0a43872b59.zip frameworks_base-3731dc220ed457e0f1e99d7ec2589e0a43872b59.tar.gz frameworks_base-3731dc220ed457e0f1e99d7ec2589e0a43872b59.tar.bz2 | |
A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI
Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
Diffstat (limited to 'services/core/jni')
| -rw-r--r-- | services/core/jni/com_android_server_AssetAtlasService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/jni/com_android_server_AssetAtlasService.cpp b/services/core/jni/com_android_server_AssetAtlasService.cpp index 3d8905d..8f4fb51 100644 --- a/services/core/jni/com_android_server_AssetAtlasService.cpp +++ b/services/core/jni/com_android_server_AssetAtlasService.cpp @@ -64,7 +64,8 @@ namespace android { static jboolean com_android_server_AssetAtlasService_upload(JNIEnv* env, jobject, jobject graphicBuffer, jobject bitmapHandle) { - SkBitmap& bitmap = *GraphicsJNI::getSkBitmapDeprecated(env, bitmapHandle); + SkBitmap bitmap; + GraphicsJNI::getSkBitmap(env, bitmapHandle, &bitmap); SkAutoLockPixels alp(bitmap); // The goal of this method is to copy the bitmap into the GraphicBuffer |