diff options
| author | John Reck <jreck@google.com> | 2015-04-13 19:20:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-13 19:20:59 +0000 |
| commit | 073f36c6c1bc937a55393f7fe9a21b95e822bfda (patch) | |
| tree | b893a2628d6bf80f5c41a0941b38809a741e6657 /core/jni/android/graphics/BitmapRegionDecoder.cpp | |
| parent | bed238fcea7c5dc5f0ad6f14d1b585b0947a4cdc (diff) | |
| parent | a771b9861d11671c780092d35c0062eeefcf37c0 (diff) | |
| download | frameworks_base-073f36c6c1bc937a55393f7fe9a21b95e822bfda.zip frameworks_base-073f36c6c1bc937a55393f7fe9a21b95e822bfda.tar.gz frameworks_base-073f36c6c1bc937a55393f7fe9a21b95e822bfda.tar.bz2 | |
Merge "Change how Java Bitmaps are accessed in a few places"
Diffstat (limited to 'core/jni/android/graphics/BitmapRegionDecoder.cpp')
| -rw-r--r-- | core/jni/android/graphics/BitmapRegionDecoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp index 3525d07..aeea808 100644 --- a/core/jni/android/graphics/BitmapRegionDecoder.cpp +++ b/core/jni/android/graphics/BitmapRegionDecoder.cpp @@ -217,7 +217,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, jlong brdHandle, if (tileBitmap != NULL) { // Re-use bitmap. - bitmap = GraphicsJNI::getSkBitmap(env, tileBitmap); + bitmap = GraphicsJNI::getSkBitmapDeprecated(env, tileBitmap); } if (bitmap == NULL) { bitmap = new SkBitmap; |