commit e48170bcbb099c2898a1152a4c407ea43e7c8d27
author Diego Perez <diegoperez@google.com> Tue Nov 01 10:29:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 01 10:29:29 2016 +0000
tree 434c5d71286fe3861e3bc9652eca9d4f4fd9c5f6
parent 9ec830d8a43922dd030b25a56599be4d908c7398
parent c93beed4e670f05104c4615d47265d125251b499

Merge "Remove refSkPixelRef"

tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java

diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
index fa880f0..4a4c6c8 100644
--- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
@@ -123,7 +123,7 @@
     /*package*/ static long initRaster(@Nullable Bitmap bitmap) {
         long nativeBitmapOrZero = 0;
         if (bitmap != null) {
-            nativeBitmapOrZero = bitmap.refSkPixelRef();
+            nativeBitmapOrZero = bitmap.getNativeInstance();
         }
         if (nativeBitmapOrZero > 0) {
             // get the Bitmap from the int