summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-09 17:14:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-09 17:14:48 +0000
commitdd0d60135f957fc6227ff61c7e369636c25095a0 (patch)
tree5a97c8de5e482243c96fe37dbb70f78605d36390
parent77322e1766b30aaa3a648823c70835ab5dbbe40b (diff)
parentc1056a65a91245d8432424c58fb93b7acb237eeb (diff)
downloadcar-dd0d60135f957fc6227ff61c7e369636c25095a0.tar.gz
Merge "Remove camera and add sensors" into rvc-dev am: c1056a65a9
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/11799330 Change-Id: I2eb30522794299a8806b005be61603de0ec271ac
-rw-r--r--common/car.mk14
-rw-r--r--common/config.ini6
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
+