diff options
| author | John Reck <jreck@google.com> | 2015-03-05 23:55:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-05 23:55:14 +0000 |
| commit | 0affc5f3eb0d42376d65410aea4b951d7167ae55 (patch) | |
| tree | e186564af5b037c8d606c6e80987910ad5798c35 /services | |
| parent | 8eed9c7e61781128503fc8b7c3cff832b95b227d (diff) | |
| parent | f4faeac3525fe1ce3707ab785a1651aec367589d (diff) | |
| download | frameworks_base-0affc5f3eb0d42376d65410aea4b951d7167ae55.zip frameworks_base-0affc5f3eb0d42376d65410aea4b951d7167ae55.tar.gz frameworks_base-0affc5f3eb0d42376d65410aea4b951d7167ae55.tar.bz2 | |
Merge "Cleanup Bitmap JNI attempt #2"
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/AssetAtlasService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/AssetAtlasService.java b/services/core/java/com/android/server/AssetAtlasService.java index a2c87b9..e6dc1c7 100644 --- a/services/core/java/com/android/server/AssetAtlasService.java +++ b/services/core/java/com/android/server/AssetAtlasService.java @@ -291,7 +291,7 @@ public class AssetAtlasService extends IAssetAtlas.Stub { } canvas.drawBitmap(bitmap, 0.0f, 0.0f, null); canvas.restore(); - atlasMap[mapIndex++] = bitmap.mNativeBitmap; + atlasMap[mapIndex++] = bitmap.getSkBitmap(); atlasMap[mapIndex++] = entry.x; atlasMap[mapIndex++] = entry.y; atlasMap[mapIndex++] = entry.rotated ? 1 : 0; |