diff options
| author | Calvin Huang <calhuang@google.com> | 2020-06-08 19:53:20 -0700 |
|---|---|---|
| committer | Calvin Huang <calhuang@google.com> | 2020-06-08 21:11:57 -0700 |
| commit | 6ae054c96e010ee08b0fd81c1a2e8975667970f3 (patch) | |
| tree | dd7607b2038b890518d0350ee2a96ceda0324156 | |
| parent | 46674d19ff4ae724c2521fd5016bd623fe24511d (diff) | |
| download | device_generic_car-6ae054c96e010ee08b0fd81c1a2e8975667970f3.tar.gz device_generic_car-6ae054c96e010ee08b0fd81c1a2e8975667970f3.tar.bz2 device_generic_car-6ae054c96e010ee08b0fd81c1a2e8975667970f3.zip | |
Remove camera and add sensors
Remove camera permission, since car emus don't support camera
Add sensors according to testSensorFeatures
Add hinge angle configs to config.ini to enable it.
Bug: 153604089
Test: atest android.app.cts.SystemFeaturesTest
Change-Id: I4a63aa9d161258ecc4860aa0bda8be09a8d3f4ad
| -rw-r--r-- | common/car.mk | 14 | ||||
| -rw-r--r-- | common/config.ini | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/common/car.mk b/common/car.mk index 6a476b5..b5993b3 100644 --- a/common/car.mk +++ b/common/car.mk @@ -37,6 +37,8 @@ PRODUCT_COPY_FILES += \ device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.ar.xml \ device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml \ device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \ + device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ + device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.any.xml \ device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ # Enable landscape @@ -58,6 +60,18 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.broadcastradio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.broadcastradio.xml \ frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \ +# 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 += \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ diff --git a/common/config.ini b/common/config.ini index 049f5f1..05ef85d 100644 --- a/common/config.ini +++ b/common/config.ini @@ -8,3 +8,9 @@ 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 + |