diff options
| author | John Reck <jreck@google.com> | 2015-03-05 13:50:31 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-03-05 13:56:16 -0800 |
| commit | f4faeac3525fe1ce3707ab785a1651aec367589d (patch) | |
| tree | b49502dc2381517f3314d16fae1eef7414314a8f /services | |
| parent | cd4ed96d10d49cb182e66aa1735f2de7596707ee (diff) | |
| download | frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.zip frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.tar.gz frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.tar.bz2 | |
Cleanup Bitmap JNI attempt #2
Original version missed a spot
This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.
Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
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; |