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

Commit 2d4ea9c4 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "SensorHAL: add moisture detection"" into main

parents 0019c711 919258a5

compatibility_matrices/compatibility_matrix.202504.xml

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ 
    </hal>

    <hal format="aidl">

        <name>android.hardware.sensors</name>

        <version>2-3</version>

        <version>2</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

sensors/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,6 @@ aidl_interface { 
        },



    ],

    frozen: false,

    frozen: true,



}

sensors/aidl/aidl_api/android.hardware.sensors/current/android/hardware/sensors/AdditionalInfo.aidl

+18 −18
Original line number Diff line number Diff line
@@ -54,23 +54,23 @@ parcelable AdditionalInfo { 
  enum AdditionalInfoType {

    AINFO_BEGIN = 0,

    AINFO_END = 1,

    AINFO_UNTRACKED_DELAY = 0x10000,

    AINFO_INTERNAL_TEMPERATURE,

    AINFO_VEC3_CALIBRATION,

    AINFO_SENSOR_PLACEMENT,

    AINFO_SAMPLING,

    AINFO_CHANNEL_NOISE = 0x20000,

    AINFO_CHANNEL_SAMPLER,

    AINFO_CHANNEL_FILTER,

    AINFO_CHANNEL_LINEAR_TRANSFORM,

    AINFO_CHANNEL_NONLINEAR_MAP,

    AINFO_CHANNEL_RESAMPLER,

    AINFO_LOCAL_GEOMAGNETIC_FIELD = 0x30000,

    AINFO_LOCAL_GRAVITY,

    AINFO_DOCK_STATE,

    AINFO_HIGH_PERFORMANCE_MODE,

    AINFO_MAGNETIC_FIELD_CALIBRATION,

    AINFO_CUSTOM_START = 0x10000000,

    AINFO_DEBUGGING_START = 0x40000000,

    AINFO_UNTRACKED_DELAY = 65536,

    AINFO_INTERNAL_TEMPERATURE = 65537,

    AINFO_VEC3_CALIBRATION = 65538,

    AINFO_SENSOR_PLACEMENT = 65539,

    AINFO_SAMPLING = 65540,

    AINFO_CHANNEL_NOISE = 131072,

    AINFO_CHANNEL_SAMPLER = 131073,

    AINFO_CHANNEL_FILTER = 131074,

    AINFO_CHANNEL_LINEAR_TRANSFORM = 131075,

    AINFO_CHANNEL_NONLINEAR_MAP = 131076,

    AINFO_CHANNEL_RESAMPLER = 131077,

    AINFO_LOCAL_GEOMAGNETIC_FIELD = 196608,

    AINFO_LOCAL_GRAVITY = 196609,

    AINFO_DOCK_STATE = 196610,

    AINFO_HIGH_PERFORMANCE_MODE = 196611,

    AINFO_MAGNETIC_FIELD_CALIBRATION = 196612,

    AINFO_CUSTOM_START = 268435456,

    AINFO_DEBUGGING_START = 1073741824,

  }

}

sensors/aidl/aidl_api/android.hardware.sensors/current/android/hardware/sensors/ISensors.aidl

+19 −19
Original line number Diff line number Diff line
@@ -44,28 +44,28 @@ interface ISensors { 
  int registerDirectChannel(in android.hardware.sensors.ISensors.SharedMemInfo mem);

  void setOperationMode(in android.hardware.sensors.ISensors.OperationMode mode);

  void unregisterDirectChannel(in int channelHandle);

  const int ERROR_NO_MEMORY = (-12) /* -12 */;

  const int ERROR_BAD_VALUE = (-22) /* -22 */;

  const int ERROR_NO_MEMORY = -12;

  const int ERROR_BAD_VALUE = -22;

  const int WAKE_LOCK_TIMEOUT_SECONDS = 1;

  const int EVENT_QUEUE_FLAG_BITS_READ_AND_PROCESS = (1 << 0) /* 1 */;

  const int EVENT_QUEUE_FLAG_BITS_EVENTS_READ = (1 << 1) /* 2 */;

  const int WAKE_LOCK_QUEUE_FLAG_BITS_DATA_WRITTEN = (1 << 0) /* 1 */;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_FIELD = 0x0;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_REPORT_TOKEN = 0x4;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_SENSOR_TYPE = 0x8;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_ATOMIC_COUNTER = 0xC;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_TIMESTAMP = 0x10;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_DATA = 0x18;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_RESERVED = 0x58;

  const int EVENT_QUEUE_FLAG_BITS_READ_AND_PROCESS = 1;

  const int EVENT_QUEUE_FLAG_BITS_EVENTS_READ = 2;

  const int WAKE_LOCK_QUEUE_FLAG_BITS_DATA_WRITTEN = 1;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_FIELD = 0;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_REPORT_TOKEN = 4;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_SENSOR_TYPE = 8;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_ATOMIC_COUNTER = 12;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_TIMESTAMP = 16;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_DATA = 24;

  const int DIRECT_REPORT_SENSOR_EVENT_OFFSET_SIZE_RESERVED = 88;

  const int DIRECT_REPORT_SENSOR_EVENT_TOTAL_LENGTH = 104;

  const int RUNTIME_SENSORS_HANDLE_BASE = 0x5F000000;

  const int RUNTIME_SENSORS_HANDLE_END = 0x5FFFFFFF;

  const int RUNTIME_SENSORS_HANDLE_BASE = 1593835520;

  const int RUNTIME_SENSORS_HANDLE_END = 1610612735;

  @Backing(type="int") @VintfStability

  enum RateLevel {

    STOP,

    NORMAL,

    FAST,

    VERY_FAST,

    STOP = 0,

    NORMAL = 1,

    FAST = 2,

    VERY_FAST = 3,

  }

  @Backing(type="int") @VintfStability

  enum OperationMode {
@@ -85,7 +85,7 @@ interface ISensors { 
    @Backing(type="int") @VintfStability

    enum SharedMemType {

      ASHMEM = 1,

      GRALLOC,

      GRALLOC = 2,

    }

  }

}

sensors/aidl/aidl_api/android.hardware.sensors/current/android/hardware/sensors/SensorInfo.aidl

+8 −8
Original line number Diff line number Diff line
@@ -54,14 +54,14 @@ parcelable SensorInfo { 
  const int SENSOR_FLAG_BITS_ON_CHANGE_MODE = 2;

  const int SENSOR_FLAG_BITS_ONE_SHOT_MODE = 4;

  const int SENSOR_FLAG_BITS_SPECIAL_REPORTING_MODE = 6;

  const int SENSOR_FLAG_BITS_DATA_INJECTION = 0x10;

  const int SENSOR_FLAG_BITS_DYNAMIC_SENSOR = 0x20;

  const int SENSOR_FLAG_BITS_ADDITIONAL_INFO = 0x40;

  const int SENSOR_FLAG_BITS_DIRECT_CHANNEL_ASHMEM = 0x400;

  const int SENSOR_FLAG_BITS_DIRECT_CHANNEL_GRALLOC = 0x800;

  const int SENSOR_FLAG_BITS_MASK_REPORTING_MODE = 0xE;

  const int SENSOR_FLAG_BITS_MASK_DIRECT_REPORT = 0x380;

  const int SENSOR_FLAG_BITS_MASK_DIRECT_CHANNEL = 0xC00;

  const int SENSOR_FLAG_BITS_DATA_INJECTION = 16;

  const int SENSOR_FLAG_BITS_DYNAMIC_SENSOR = 32;

  const int SENSOR_FLAG_BITS_ADDITIONAL_INFO = 64;

  const int SENSOR_FLAG_BITS_DIRECT_CHANNEL_ASHMEM = 1024;

  const int SENSOR_FLAG_BITS_DIRECT_CHANNEL_GRALLOC = 2048;

  const int SENSOR_FLAG_BITS_MASK_REPORTING_MODE = 14;

  const int SENSOR_FLAG_BITS_MASK_DIRECT_REPORT = 896;

  const int SENSOR_FLAG_BITS_MASK_DIRECT_CHANNEL = 3072;

  const int SENSOR_FLAG_SHIFT_REPORTING_MODE = 1;

  const int SENSOR_FLAG_SHIFT_DATA_INJECTION = 4;

  const int SENSOR_FLAG_SHIFT_DYNAMIC_SENSOR = 5;