summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-04-13 15:20:29 -0700
committerJohn Reck <jreck@google.com>2015-04-14 15:38:22 -0700
commitc294d128d03bc9a9982b273a82516c04583438cc (patch)
treefd6c7ae3a6a292caf48160f0c0c8cc82e4729225 /core/java
parent4fc266bbef6129b5cefc910f0680eb9d61794faf (diff)
downloadframeworks_base-c294d128d03bc9a9982b273a82516c04583438cc.zip
frameworks_base-c294d128d03bc9a9982b273a82516c04583438cc.tar.gz
frameworks_base-c294d128d03bc9a9982b273a82516c04583438cc.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 'core/java')
-rw-r--r--core/java/android/view/ThreadedRenderer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index 87d5d9a..5017a38 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -360,7 +360,7 @@ public class ThreadedRenderer extends HardwareRenderer {
@Override
boolean copyLayerInto(final HardwareLayer layer, final Bitmap bitmap) {
return nCopyLayerInto(mNativeProxy,
- layer.getDeferredLayerUpdater(), bitmap.getSkBitmap());
+ layer.getDeferredLayerUpdater(), bitmap);
}
@Override
@@ -531,7 +531,7 @@ public class ThreadedRenderer extends HardwareRenderer {
private static native long nCreateTextureLayer(long nativeProxy);
private static native void nBuildLayer(long nativeProxy, long node);
- private static native boolean nCopyLayerInto(long nativeProxy, long layer, long bitmap);
+ private static native boolean nCopyLayerInto(long nativeProxy, long layer, Bitmap bitmap);
private static native void nPushLayerUpdate(long nativeProxy, long layer);
private static native void nCancelLayerUpdate(long nativeProxy, long layer);
private static native void nDetachSurfaceTexture(long nativeProxy, long layer);