commit 4a9c3891d4f890109e02bc83fecf9bcdf56a9395
author Mike Reed <reed@google.com> Mon Jul 07 15:44:40 2014 -0400
committer Mike Reed <reed@google.com> Mon Jul 07 15:47:55 2014 -0400
tree d0ad820a4e7b143df8d71708a7790e59b0467189
parent 904a1045ced36e844605b9764c3cb184976ea0a9

kNative_8888_SkColorType is now kN32_SkColorType

Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b

core/jni/android/graphics/BitmapFactory.cpp

diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index c99066d..52f611a 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -116,7 +116,7 @@
     switch (colorType) {
         case kUnknown_SkColorType:
         case kIndex_8_SkColorType:
-            return kNative_8888_SkColorType;
+            return kN32_SkColorType;
         default:
             break;
     }

libs/input/SpriteController.cpp

diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp
index 063383b..a69c32d 100644
--- a/libs/input/SpriteController.cpp
+++ b/libs/input/SpriteController.cpp
@@ -401,7 +401,7 @@
 
     uint32_t dirty;
     if (icon.isValid()) {
-        icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kNative_8888_SkColorType);
+        icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kN32_SkColorType);
 
         if (!mLocked.state.icon.isValid()
                 || mLocked.state.icon.hotSpotX != icon.hotSpotX

libs/input/SpriteController.h

diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
index 797efd7..905833c7 100644
--- a/libs/input/SpriteController.h
+++ b/libs/input/SpriteController.h
@@ -65,7 +65,7 @@
 
     inline SpriteIcon copy() const {
         SkBitmap bitmapCopy;
-        bitmap.copyTo(&bitmapCopy, kNative_8888_SkColorType);
+        bitmap.copyTo(&bitmapCopy, kN32_SkColorType);
         return SpriteIcon(bitmapCopy, hotSpotX, hotSpotY);
     }
 

services/core/jni/com_android_server_input_InputManagerService.cpp

diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index 34ae8b4..8ed74be 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -150,7 +150,7 @@
     status_t status = android_view_PointerIcon_loadSystemIcon(env,
             contextObj, style, &pointerIcon);
     if (!status) {
-        pointerIcon.bitmap.copyTo(&outSpriteIcon->bitmap, kNative_8888_SkColorType);
+        pointerIcon.bitmap.copyTo(&outSpriteIcon->bitmap, kN32_SkColorType);
         outSpriteIcon->hotSpotX = pointerIcon.hotSpotX;
         outSpriteIcon->hotSpotY = pointerIcon.hotSpotY;
     }