From 37317b63338b68d579cba9c19aac1030e715c704 Mon Sep 17 00:00:00 2001
From: Peng Xu <pengxu@google.com>
Date: Tue, 7 Mar 2017 17:49:31 -0800
Subject: Fix enum ordering in sensor NDK

Test: compiles
Change-Id: Ie186270af2f51d723855cdc62f0b09ffe1ab6ecf
---
 include/android/sensor.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/android/sensor.h b/include/android/sensor.h
index d9998ba425..186f62c65e 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -69,6 +69,10 @@ typedef struct AHardwareBuffer AHardwareBuffer;
  * (keep in sync with hardware/sensors.h)
  */
 enum {
+    /**
+     * Invalid sensor type. Returned by {@link ASensor_getType} as error value.
+     */
+    ASENSOR_TYPE_INVALID = -1,
     /**
      * {@link ASENSOR_TYPE_ACCELEROMETER}
      * reporting-mode: continuous
@@ -118,11 +122,7 @@ enum {
      *  All values are in SI units (m/s^2) and measure the acceleration of the
      *  device not including the force of gravity.
      */
-    ASENSOR_TYPE_LINEAR_ACCELERATION = 10,
-    /**
-     * Invalid sensor type. Returned by {@link ASensor_getType} as error value.
-     */
-    ASENSOR_TYPE_INVALID = -1
+    ASENSOR_TYPE_LINEAR_ACCELERATION = 10
 };
 
 /**
@@ -145,6 +145,8 @@ enum {
  * Sensor Reporting Modes.
  */
 enum {
+    /** invalid reporting mode */
+    AREPORTING_MODE_INVALID = -1,
     /** continuous reporting */
     AREPORTING_MODE_CONTINUOUS = 0,
     /** reporting on change */
@@ -152,9 +154,7 @@ enum {
     /** on shot reporting */
     AREPORTING_MODE_ONE_SHOT = 2,
     /** special trigger reporting */
-    AREPORTING_MODE_SPECIAL_TRIGGER = 3,
-    /** invalid reporting mode */
-    AREPORTING_MODE_INVALID = -1
+    AREPORTING_MODE_SPECIAL_TRIGGER = 3
 };
 
 /**
-- 
cgit v1.2.3-59-g8ed1b