From a89865b297525a1790d43347c641ee77ee6a79c5 Mon Sep 17 00:00:00 2001 From: Tanmay Patil Date: Mon, 21 Sep 2020 14:44:05 -0700 Subject: Removes invalid sensors for automotive emulator Removes sensors that are not valid or irrelevant for automotive use-cases on car emulator. Keeps only the accel and gyro sensors, removes: proximity, hinge etc. Modifies the emulator mk file to remove features and the config.ini to remove hardware. Verified on sdk_gcar_x86 Bug: b/153604089 Test: atest SystemFeaturesTest#testSensorFeatures Change-Id: I86da1cfcbdc4e64d386fbe4449fc69b461036351 (cherry picked from commit eecc3621bb4b12e701ed44419444ec564953986e) (cherry picked from commit e52c884359d8f9f678b93d19117e581f0ac1ed30) --- common/car.mk | 7 ------- common/config.ini | 16 ++++++++++------ 2 files changed, 10 insertions(+), 13 deletions(-) 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 @@ PRODUCT_COPY_FILES += \ # 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.dynamic=yes 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 -- cgit v1.2.3