commit a865edb313d470431818d93a5f3c2f7742ab4890
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 15 17:23:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 15 17:23:32 2016 +0000
tree c819c41917af3da25f30355e261761bdf0136af7
parent ab2e00be4b8228fcde1e92d04232a1df5cae2504
parent 4661b118615ac3c0eda4e2c7168e90f3eda4fde6

Merge "Run vehicle HAL service as vehicle_network user"

graphics/common/1.0/types.hal

diff --git a/graphics/common/1.0/types.hal b/graphics/common/1.0/types.hal
index 9726c3a..67ff353 100644
--- a/graphics/common/1.0/types.hal
+++ b/graphics/common/1.0/types.hal
@@ -40,11 +40,11 @@
     /*
      * The following formats use a 16bit float per color component.
      */
-    RGBA_FP16          = 0x10,
-    RGBX_FP16          = 0x11,
+    RGBA_FP16          = 0x16,
+    RGBX_FP16          = 0x17,
 
     /*
-     * 0x100 - 0x1FF
+     * 0x101 - 0x1FF
      *
      * This range is reserved for pixel formats that are specific to the HAL
      * implementation.  Implementations can use any value in this range to
@@ -422,9 +422,10 @@
     FLEX_RGBA_8888 = 0x2A,
 
     /* Legacy formats (deprecated), used by ImageFormat.java */
-    YCBCR_422_SP       = 0x10, // NV16
-    YCRCB_420_SP       = 0x11, // NV21
-    YCBCR_422_I        = 0x14, // YUY2
+    YCBCR_422_SP       = 0x10,  // NV16
+    YCRCB_420_SP       = 0x11,  // NV21
+    YCBCR_422_I        = 0x14,  // YUY2
+    JPEG               = 0x100,
 };
 
 /**

radio/1.0/types.hal

diff --git a/radio/1.0/types.hal b/radio/1.0/types.hal
index 9c4b453..5b853b4 100644
--- a/radio/1.0/types.hal
+++ b/radio/1.0/types.hal
@@ -51,6 +51,7 @@
 };
 
 enum RadioError : int32_t {
+    INVALID_RESPONSE = -1,                // Response from vendor had invalid data
     NONE = 0,                             // Success
     RADIO_NOT_AVAILABLE = 1,              // If radio did not start or is resetting
     GENERIC_FAILURE = 2,