commit ed87fa2a2d7afe9e04c49c931c862dd3c550424c
author Ben Wagner <bungeman@google.com> Fri Feb 19 17:56:44 2016 -0500
committer Ben Wagner <bungeman@google.com> Mon Feb 22 16:26:02 2016 +0000
tree 4cf4d494f548216d7d224603ce23f4c4b7b0d3b6
parent 90d80dfa0457bd627d1e60d715c7a822e461427e

Use android_memset32 instead of sk_memset32.

Android code should use the Android version. Also, Skia is interested
in making sk_memset32 private.

BUG:27290333

Change-Id: Id5c8bc190cdd21673c8844eaa48e8b6a93e2e9df

libs/hwui/utils/TestWindowContext.cpp

diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp
index b0431ce..9ee5fc6 100644
--- a/libs/hwui/utils/TestWindowContext.cpp
+++ b/libs/hwui/utils/TestWindowContext.cpp
@@ -28,6 +28,7 @@
 #include "gui/Surface.h"
 #include "renderthread/RenderProxy.h"
 
+#include <cutils/memory.h>
 
 namespace {
 
@@ -119,8 +120,8 @@
             SkImageInfo::Make(mSize.width(), mSize.height(),
                               kRGBA_8888_SkColorType, kPremul_SkAlphaType);
         bmp->allocPixels(destinationConfig);
-        sk_memset32((uint32_t*) bmp->getPixels(), SK_ColorRED,
-                    mSize.width() * mSize.height());
+        android_memset32((uint32_t*) bmp->getPixels(), SK_ColorRED,
+                         mSize.width() * mSize.height() * 4);
 
         android::CpuConsumer::LockedBuffer nativeBuffer;
         android::status_t retval = mCpuConsumer->lockNextBuffer(&nativeBuffer);