commit 98361f86189f6b5f31580ce6f7e38e548c5a256b
author Romain Guy <romainguy@google.com> Wed Dec 14 10:10:49 2016 -0800
committer Romain Guy <romainguy@google.com> Wed Dec 14 10:10:49 2016 -0800
tree 59fb46f8affc140295af49d6aa7ad8d68fd4d109
parent ddb6b3bca5934420f5971c9477a2cff27f312620

Prevent conflict with deprecated pixel format constants

Bug: 32984164
Test: Compile
Change-Id: Ia075c24740eeb33ca748e3423da156ffb9af0550

include/system/graphics-base.h

diff --git a/include/system/graphics-base.h b/include/system/graphics-base.h
index ab8bb0e..36800ae 100644
--- a/include/system/graphics-base.h
+++ b/include/system/graphics-base.h
@@ -14,8 +14,8 @@
     HAL_PIXEL_FORMAT_RGB_888 = 3,
     HAL_PIXEL_FORMAT_RGB_565 = 4,
     HAL_PIXEL_FORMAT_BGRA_8888 = 5,
-    HAL_PIXEL_FORMAT_RGBA_FP16 = 16, // 0x10
-    HAL_PIXEL_FORMAT_RGBX_FP16 = 17, // 0x11
+    HAL_PIXEL_FORMAT_RGBA_FP16 = 22, // 0x16
+    HAL_PIXEL_FORMAT_RGBX_FP16 = 23, // 0x17
     HAL_PIXEL_FORMAT_YV12 = 842094169, // 0x32315659
     HAL_PIXEL_FORMAT_Y8 = 538982489, // 0x20203859
     HAL_PIXEL_FORMAT_Y16 = 540422489, // 0x20363159