Snap for 6916203 from bc7edf802e8ecf4edbd982a5a1afcb5c1f711d95 to mainline-release
Change-Id: I451b52d80a29ec91ee48c0abfd2966c7c558a1d6
diff --git a/common/car.mk b/common/car.mk
index b5993b3..e9f1778 100644
--- a/common/car.mk
+++ b/common/car.mk
@@ -63,14 +63,7 @@
# Sensor features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
- frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \
- frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \
- frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \
- frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \
- frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.ambient_temperature.xml \
- frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.relative_humidity.xml \
- frameworks/native/data/etc/android.hardware.sensor.hinge_angle.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hinge_angle.xml \
# Copy APN configs
PRODUCT_COPY_FILES += \
diff --git a/common/config.ini b/common/config.ini
index 05ef85d..4b6f766 100644
--- a/common/config.ini
+++ b/common/config.ini
@@ -8,9 +8,13 @@
skin.name=1080x600
skin.path=1080x600
disk.dataPartition.size=6G
-hw.sensor.hinge=yes
-hw.sensor.hinge.count=2
-Hw.sensor.hinge.type=0
-hw.sensor.hinge.ranges=0-360, 0-180
-hw.sensor.hinge.defaults=180, 180
-
+hw.accelerometer=yes
+hw.gyroscope=yes
+hw.sensors.light=no
+hw.sensors.pressure=no
+hw.sensors.humidity=no
+hw.sensors.proximity=no
+hw.sensors.magnetic_field=no
+hw.sensors.orientation=no
+hw.sensors.temperature=no
+hw.sensor.hinge=no
