summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Perez <diegoperez@google.com>2016-05-05 12:21:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-05 12:21:35 +0000
commite37ecbdede9bb3b4fadba359891b13eb5cd6c697 (patch)
treeab06ef7cc177985ee05c3876bf7bf93999bcf055
parent00e8fef0ba61cd57cd36beeb81ae1eb20ac04eaf (diff)
parentd7d2119fe37f48e4157c3bc471c1153544cf5604 (diff)
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev
-rw-r--r--tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
index 6d8ecd7c1b96..f1da3a266448 100644
--- a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
@@ -303,6 +303,13 @@ public final class Bitmap_Delegate {
}
@LayoutlibDelegate
+ /*package*/ static Bitmap nativeCopyAshmemConfig(long nativeSrcBitmap, int nativeConfig) {
+ // Unused method; no implementation provided.
+ assert false;
+ return null;
+ }
+
+ @LayoutlibDelegate
/*package*/ static long nativeGetNativeFinalizer() {
synchronized (Bitmap_Delegate.class) {
if (sFinalizer == -1) {