commit 489edb395bfd626a93b6401f6ee3712040fc4f76
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 21 18:38:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 21 18:38:23 2017 +0000
tree b08bbd0e0fa5987a9ab4a36bea5451b50a82b01f
parent 62a24e949398645d55fcaeb03f72e194e3464928
parent 7e7d0d54e00d98c2db2dd306acf497f4ddcf03b8

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

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;