summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-04-16 03:08:41 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-04-16 03:08:41 +0000
commit53d37afd4101a08fb0ffa46414202d85dea1000a (patch)
treecb9486c50131d0c0264e09c3245e760b12398deb
parent7680ae1d3a80a497fd73a333212262b6d1914d7d (diff)
parent40220283ac8a566ca35a88c989c5d5ce5a0967cc (diff)
downloadandroid_device_generic_goldfish-53d37afd4101a08fb0ffa46414202d85dea1000a.tar.gz
android_device_generic_goldfish-53d37afd4101a08fb0ffa46414202d85dea1000a.tar.bz2
android_device_generic_goldfish-53d37afd4101a08fb0ffa46414202d85dea1000a.zip
Snap for 5472349 from 40220283ac8a566ca35a88c989c5d5ce5a0967cc to qt-release
Change-Id: I0056404870b0d9379cb25047c66b2aef5e4a553f
-rw-r--r--manifest-arm.xml9
-rw-r--r--manifest.xml9
-rw-r--r--sepolicy/common/file_contexts1
-rw-r--r--vendor.mk2
4 files changed, 21 insertions, 0 deletions
diff --git a/manifest-arm.xml b/manifest-arm.xml
index 26d4b3d..2189d91 100644
--- a/manifest-arm.xml
+++ b/manifest-arm.xml
@@ -200,6 +200,15 @@
<instance>default</instance>
</interface>
</hal>
+ <hal format="hidl">
+ <name>android.hardware.thermal</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IThermal</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
<sepolicy>
<version>27.0</version>
</sepolicy>
diff --git a/manifest.xml b/manifest.xml
index bd53071..dd598e8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -200,6 +200,15 @@
<instance>default</instance>
</interface>
</hal>
+ <hal format="hidl">
+ <name>android.hardware.thermal</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IThermal</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
<sepolicy>
<version>27.0</version>
</sepolicy>
diff --git a/sepolicy/common/file_contexts b/sepolicy/common/file_contexts
index a03f11e..c1350f9 100644
--- a/sepolicy/common/file_contexts
+++ b/sepolicy/common/file_contexts
@@ -36,6 +36,7 @@
/vendor/bin/hw/android\.hardware\.keymaster@4\.0-strongbox-service u:object_r:hal_keymaster_default_exec:s0
/vendor/bin/hw/android\.hardware\.health@2\.0-service.goldfish u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/android\.hardware\.power@1\.1-service.ranchu u:object_r:hal_power_default_exec:s0
+/vendor/bin/hw/android\.hardware\.thermal@2\.0-service.mock u:object_r:hal_thermal_default_exec:s0
/vendor/lib(64)?/hw/vulkan\.ranchu\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/gralloc\.ranchu\.so u:object_r:same_process_hal_file:s0
diff --git a/vendor.mk b/vendor.mk
index e78e43b..535d59f 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -130,6 +130,8 @@ PRODUCT_PACKAGES += \
netmgr \
wpa_supplicant \
+PRODUCT_PACKAGES += android.hardware.thermal@2.0-service.mock
+
# Needed for /system/priv-app/SdkSetup/SdkSetup.apk to pass CTS android.permission2.cts.PrivappPermissionsTest.
PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml