Merge "Match AHardwareBuffer format name change" into oc-dev

2017-04-21 18:38:19 +00:00
parent 62a24e9493 7e7d0d54e0
commit 489edb395b
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android_view_TextureView.cpp
+++ b/core/jni/android_view_TextureView.cpp
@@ -83,7 +83,7 @@ static inline SkImageInfo convertPixelFormat(const ANativeWindow_Buffer& buffer)
            colorType = kN32_SkColorType;
            alphaType = kOpaque_SkAlphaType;
            break;
-        case AHARDWAREBUFFER_FORMAT_R16G16B16A16_SFLOAT:
+        case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
            colorType = kRGBA_F16_SkColorType;
            alphaType = kPremul_SkAlphaType;
            break;