summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-05-04 14:34:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-04 14:34:39 +0000
commit1641c0cb0b6baf313c82846fe4f64007078c604f (patch)
tree0bb708048847af2e31dccd2361a5e3cc95fabca0 /graphics
parent335f043bdb20f3528f486ad91eb9e1fdf8f673ab (diff)
parentc6e2e8ff474ae44bab5b9eb665851118abd27b68 (diff)
downloadframeworks_base-1641c0cb0b6baf313c82846fe4f64007078c604f.zip
frameworks_base-1641c0cb0b6baf313c82846fe4f64007078c604f.tar.gz
frameworks_base-1641c0cb0b6baf313c82846fe4f64007078c604f.tar.bz2
Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Bitmap.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index e2f7799..76d6edf 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -1573,6 +1573,15 @@ public final class Bitmap implements Parcelable {
return mSkBitmapPtr;
}
+ /**
+ * Refs the underlying SkPixelRef and returns a pointer to it.
+ *
+ * @hide
+ * */
+ public final long refSkPixelRef() {
+ return nativeRefPixelRef(mSkBitmapPtr);
+ }
+
private static class BitmapFinalizer {
private long mNativeBitmap;
@@ -1661,4 +1670,5 @@ public final class Bitmap implements Parcelable {
private static native boolean nativeHasMipMap(long nativeBitmap);
private static native void nativeSetHasMipMap(long nativeBitmap, boolean hasMipMap);
private static native boolean nativeSameAs(long nativeBitmap0, long nativeBitmap1);
+ private static native long nativeRefPixelRef(long nativeBitmap);
}