commit 919258a5867165de9abe377f30a0b7a8fc9a2c99
author Priyanka Advani (xWF) <padvani@google.com> Wed Dec 04 17:56:03 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 04 17:56:05 2024 +0000
tree 44bf4f5d4cdd3bbaf8579c08a9ec8b9625ee8231
parent 8127b300da0e17a51ef62c0d63c4970cda111172

Revert "SensorHAL: add moisture detection"

Revert submission 30509949-waterIntrusion

Reason for revert: Droidmonitor created revert due to b/382268952. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:30509949-waterIntrusion

Change-Id: Iaebccf3bf342eb1e4b60f3ea50178cc0b0a641c3

sensors/aidl/default/Android.bp

diff --git a/sensors/aidl/default/Android.bp b/sensors/aidl/default/Android.bp
index 4bdcfb0..6f011ee 100644
--- a/sensors/aidl/default/Android.bp
+++ b/sensors/aidl/default/Android.bp
@@ -32,7 +32,7 @@
         "libfmq",
         "libpower",
         "libbinder_ndk",
-        "android.hardware.sensors-V3-ndk",
+        "android.hardware.sensors-V2-ndk",
     ],
     export_include_dirs: ["include"],
     srcs: [
@@ -58,7 +58,7 @@
     static_libs: [
         "android.hardware.common-V2-ndk",
         "android.hardware.common.fmq-V1-ndk",
-        "android.hardware.sensors-V3-ndk",
+        "android.hardware.sensors-V2-ndk",
         "android.system.suspend-V1-ndk",
         "libbase",
         "libcutils",

sensors/aidl/default/multihal/Android.bp

diff --git a/sensors/aidl/default/multihal/Android.bp b/sensors/aidl/default/multihal/Android.bp
index 6ca81d9..7482ffe 100644
--- a/sensors/aidl/default/multihal/Android.bp
+++ b/sensors/aidl/default/multihal/Android.bp
@@ -39,7 +39,7 @@
         "android.hardware.sensors@1.0",
         "android.hardware.sensors@2.0",
         "android.hardware.sensors@2.1",
-        "android.hardware.sensors-V3-ndk",
+        "android.hardware.sensors-V2-ndk",
     ],
     export_include_dirs: ["include"],
     srcs: [

sensors/aidl/default/sensors-default.xml

diff --git a/sensors/aidl/default/sensors-default.xml b/sensors/aidl/default/sensors-default.xml
index bed2538..36b28ed 100644
--- a/sensors/aidl/default/sensors-default.xml
+++ b/sensors/aidl/default/sensors-default.xml
@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.sensors</name>
-        <version>3</version>
+        <version>2</version>
         <fqname>ISensors/default</fqname>
     </hal>
 </manifest>