diff options
| author | John Reck <jreck@google.com> | 2015-05-01 01:32:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-01 01:32:46 +0000 |
| commit | 6dc2c89b49c5549c27a22111db7d4ec1b4827e86 (patch) | |
| tree | c67065673a08679e7b42c5ce8911ff82732f454b /services | |
| parent | ab5ed9d2b63210d4b5132d3cf26b19f82e9dbd74 (diff) | |
| parent | 0385dc8d12088d98ab76de86db4cd8e1ffa34af7 (diff) | |
| download | frameworks_base-6dc2c89b49c5549c27a22111db7d4ec1b4827e86.zip frameworks_base-6dc2c89b49c5549c27a22111db7d4ec1b4827e86.tar.gz frameworks_base-6dc2c89b49c5549c27a22111db7d4ec1b4827e86.tar.bz2 | |
am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7':
Change how Java Bitmaps are accessed in a few places
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/jni/com_android_server_AssetAtlasService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/jni/com_android_server_AssetAtlasService.cpp b/services/core/jni/com_android_server_AssetAtlasService.cpp index ad1d0f5..3d8905d 100644 --- a/services/core/jni/com_android_server_AssetAtlasService.cpp +++ b/services/core/jni/com_android_server_AssetAtlasService.cpp @@ -64,7 +64,7 @@ namespace android { static jboolean com_android_server_AssetAtlasService_upload(JNIEnv* env, jobject, jobject graphicBuffer, jobject bitmapHandle) { - SkBitmap& bitmap = *GraphicsJNI::getSkBitmap(env, bitmapHandle); + SkBitmap& bitmap = *GraphicsJNI::getSkBitmapDeprecated(env, bitmapHandle); SkAutoLockPixels alp(bitmap); // The goal of this method is to copy the bitmap into the GraphicBuffer |