summaryrefslogtreecommitdiff
path: root/libs/hwui/jni/Utils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libs/hwui/jni/Utils.cpp')
-rw-r--r--libs/hwui/jni/Utils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/jni/Utils.cpp b/libs/hwui/jni/Utils.cpp
index 34fd6687d52c..ac2f5b77d23a 100644
--- a/libs/hwui/jni/Utils.cpp
+++ b/libs/hwui/jni/Utils.cpp
@@ -114,7 +114,7 @@ size_t AssetStreamAdaptor::read(void* buffer, size_t size) {
return amount;
}
-SkMemoryStream* android::CopyAssetToStream(Asset* asset) {
+sk_sp<SkData> android::CopyAssetToData(Asset* asset) {
if (NULL == asset) {
return NULL;
}
@@ -138,7 +138,7 @@ SkMemoryStream* android::CopyAssetToStream(Asset* asset) {
return NULL;
}
- return new SkMemoryStream(std::move(data));
+ return data;
}
jobject android::nullObjectReturn(const char msg[]) {