commit 8b9dca446ce1f43f250c4d1655fbb2f85c8fdb53
author Alistair Strachan <astrachan@google.com> Wed Apr 17 15:50:56 2019 -0700
committer Alistair Strachan <astrachan@google.com> Wed Apr 17 15:50:58 2019 -0700
tree 34a8179dbdc00ba8ae46f6ec14182164e5ecd075
parent 0075b694e7230b47655960a5e9c898b82bc153e4

Turn down the thermal HAL

This HAL should work, but it doesn't. We don't need the trouble on AOSP
at the moment. Turn down the HAL.

Bug: 130585465
Change-Id: I80923801fed776d16621dfd7682478465c2b707c
Signed-off-by: Alistair Strachan <astrachan@google.com>

shared/config/manifest.xml

diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 53e9c39..2b46af0 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -381,7 +381,7 @@
         </interface>
     </hal>
     -->
-    <!-- FIXME: Upgrade thermal to 1.1 -->
+    <!-- FIXME: AOSP thermal HAL 1.0 is broken
     <hal format="hidl">
         <name>android.hardware.thermal</name>
         <transport>hwbinder</transport>
@@ -391,6 +391,7 @@
             <instance>default</instance>
         </interface>
     </hal>
+    -->
     <hal format="hidl">
         <name>android.hardware.usb</name>
         <transport>hwbinder</transport>

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index cbe9f03..24068c7 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -283,12 +283,6 @@
     sensors.cutf \
     android.hardware.sensors@1.0-impl \
     android.hardware.sensors@1.0-service
-#
-# Thermal (mock)
-#
-PRODUCT_PACKAGES += \
-    android.hardware.thermal@1.0-impl \
-    android.hardware.thermal@1.0-service
 
 #
 # Lights
@@ -336,7 +330,6 @@
     android.hardware.usb@1.0-service
 
 # TODO vibrator HAL
-# TODO thermal
 
 PRODUCT_PACKAGES += \
     cuttlefish_dtb

shared/sepolicy/file_contexts

diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index d1d25c9..4d1c6f7 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -48,7 +48,6 @@
 /vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-sample-.*   u:object_r:hal_neuralnetworks_sample_exec:s0
 /vendor/bin/ip_link_add  u:object_r:ip_link_add_exec:s0
 /vendor/bin/setup_wifi  u:object_r:setup_wifi_exec:s0
-/vendor/bin/hw/android\.hardware\.thermal@1\.0-service\.mock  u:object_r:hal_thermal_default_exec:s0
 /vendor/bin/hw/android\.hardware\.authsecret@1\.0-service  u:object_r:hal_authsecret_default_exec:s0
 
 /vendor/lib(64)?/cuttlefish_auto_resources.so  u:object_r:same_process_hal_file:s0