Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b69cbd6 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

resolved conflicts for merge of 335e0e08 to mnc-dr-dev-plus-aosp 

Change-Id: I77587cf9128b003ed0f77ddfe11e688dcfe37a9c
parents 2fcd675b 335e0e08

include/android/sensor.h

+14 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ extern "C" { 


/**

 * Sensor types.

 * (keep in sync with hardware/sensor.h)

 * (keep in sync with hardware/sensors.h)

 */

enum {

    /**
@@ -103,7 +103,15 @@ enum { 
     * SENSOR_FLAG_WAKE_UP.

     * The value corresponds to the distance to the nearest object in centimeters.

     */

    ASENSOR_TYPE_PROXIMITY          = 8

    ASENSOR_TYPE_PROXIMITY           = 8,

    /**

     * {@link ASENSOR_TYPE_LINEAR_ACCELERATION}

     * reporting-mode: continuous

     *

     *  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

};



/**