commit fb5e57cd43c550bf4dc12007929ce29e69676340
author Jesse Hall <jessehall@google.com> Fri Apr 21 19:05:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 21 19:05:28 2017 +0000
tree f97e72ffaa70d5c5c4578d01cea307fbda1e4f74
parent 0ffabda3e6e63de1ed8f4ae16f0bfa7add0fcc99
parent 89d3d2ae01f1b322a946dc49090a7795de86c1d4

Merge "Match AHardwareBuffer format name change" into oc-dev am: 489edb395b
am: 89d3d2ae01

Change-Id: I5f3da6a9e9b3bbe621e433947754d79a0e6a3691

core/jni/android_view_TextureView.cpp

diff --git a/core/jni/android_view_TextureView.cpp b/core/jni/android_view_TextureView.cpp
index 18a1360..2921b37 100644
--- a/core/jni/android_view_TextureView.cpp
+++ b/core/jni/android_view_TextureView.cpp
@@ -83,7 +83,7 @@
             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;