[SQUASH] Revert "universal7885: import Pixel thermal HAL"

This reverts commit cb95ff03729f9721c1a2af56e349a880c416ea59.

Revert "universal7885: sepolicy: Add another rule for thermal hal"

This reverts commit e695df796cf6b39e88652b2829bb18fc797ac0c8.

Revert "universal7885: switch to pixel thermal hal"

This reverts commit b8f413737399e34405322865d1efb391648124d7.
This commit is contained in:
roynatech2544 2022-02-11 17:05:17 +09:00
commit c8b0cf2f9f
No known key found for this signature in database
GPG key ID: 9675C32163D88D30
10 changed files with 9 additions and 146 deletions

View file

@ -1,3 +1,2 @@
soong_namespace {
imports: ["hardware/google/interfaces"],
}

View file

@ -1,103 +0,0 @@
{
"Sensors": [
{
"Name": "BIG",
"Type": "CPU",
"HotThreshold": [
"NAN",
"NAN",
"NAN",
91.0,
"NAN",
"NAN",
115.0
],
"VrThreshold": "NAN",
"Multiplier": 0.001
},
{
"Name": "LITTLE",
"Type": "CPU",
"HotThreshold": [
"NAN",
"NAN",
"NAN",
91.0,
"NAN",
"NAN",
115.0
],
"VrThreshold": "NAN",
"Multiplier": 0.001
},
{
"Name": "G3D",
"Type": "GPU",
"HotThreshold": [
"NAN",
"NAN",
"NAN",
91.0,
"NAN",
"NAN",
115.0
],
"VrThreshold": "NAN",
"Multiplier": 0.001
},
{
"Name": "ac",
"Type": "USB_PORT",
"HotThreshold": [
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"60.0",
"NAN"
],
"HotHysteresis": [
0.0,
0.0,
0.0,
0.0,
0.0,
5.0,
0.0
],
"VrThreshold": "NAN",
"Multiplier": 0.001,
"Monitor": true
},
{
"Name": "battery",
"Type": "BATTERY",
"HotThreshold": [
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
60.0
],
"VrThreshold": "NAN",
"Multiplier": 0.001
}
],
"CoolingDevices": [
{
"Name": "thermal-cpufreq-0",
"Type": "CPU"
},
{
"Name": "thermal-cpufreq-1",
"Type": "CPU"
},
{
"Name": "thermal-gpufreq-0",
"Type": "GPU"
}
]
}

View file

@ -13,7 +13,6 @@ type gps_device, dev_type;
# /dev/goodix_fp
type goodix_device, dev_type;
type thermal_link_device, dev_type;
# device.te
type efs_block_device, dev_type;

View file

@ -217,11 +217,6 @@
/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.gnss@[0-9]\.[0-9]-service u:object_r:hal_gnss_default_exec:s0
/(vendor|system/vendor)/firmware(/.*)? u:object_r:vendor_firmware_file:s0
# Thermal
/(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@2\.0-service\.pixel u:object_r:hal_thermal_default_exec:s0
/dev/thermal(/.*)? u:object_r:thermal_link_device:s0
/vendor/bin/thermal_symlinks u:object_r:init-thermal-symlinks-sh_exec:s0
# SamsungParts
/(vendor|system/vendor)/bin/hw/vendor\.eureka\.hardware\.battery@1\.0-service u:object_r:hal_battery_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.eureka\.hardware\.flashlight@1\.0-service u:object_r:hal_flashlight_default_exec:s0

View file

@ -1,12 +1,8 @@
# /acct/tasks
allow hal_thermal_default cgroup:file getattr;
# /sys/devices/virtual/thermal/
allow hal_thermal_default sysfs_thermal:dir r_dir_perms;
allow hal_thermal_default sysfs_thermal:file rw_file_perms;
allow hal_thermal_default sysfs_thermal:lnk_file r_file_perms;
allow hal_thermal_default thermal_link_device:dir r_dir_perms;
allow hal_thermal_default proc_stat:file r_file_perms;
allow hal_thermal_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
hal_client_domain(hal_thermal_default, hal_power);
get_prop(hal_thermal_default, vendor_thermal_prop)
allow hal_thermal_default sysfs_virtual:dir search;
allow hal_thermal_default sysfs_thermal:file r_file_perms;
r_dir_file(hal_thermal_default, sysfs_virtual)

View file

@ -1,11 +0,0 @@
type init-thermal-symlinks-sh, domain;
type init-thermal-symlinks-sh_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(init-thermal-symlinks-sh)
allow init-thermal-symlinks-sh vendor_toolbox_exec:file rx_file_perms;
allow init-thermal-symlinks-sh thermal_link_device:dir rw_dir_perms;
allow init-thermal-symlinks-sh thermal_link_device:lnk_file create_file_perms;
allow init-thermal-symlinks-sh sysfs_thermal:dir r_dir_perms;
allow init-thermal-symlinks-sh sysfs_thermal:file r_file_perms;
allow init-thermal-symlinks-sh sysfs_thermal:lnk_file r_file_perms;
set_prop(init-thermal-symlinks-sh, vendor_thermal_prop)
allow init-thermal-symlinks-sh sysfs_virtual:dir search;

View file

@ -18,4 +18,3 @@ vendor_internal_prop(rild_prop)
vendor_internal_prop(vendor_secureos_prop)
vendor_internal_prop(vendor_tzdaemon_prop)
vendor_internal_prop(vendor_tztsdaemon_prop)
vendor_internal_prop(vendor_thermal_prop)

View file

@ -65,9 +65,6 @@ vendor.wlbtd. u:object_r:vendor_wlbtd_prop:s0
# Wlan
vendor.wlan. u:object_r:vendor_wlan_prop:s0
# Thermal
vendor.thermal. u:object_r:vendor_thermal_prop:s0
# Hwc
hwc.exynos.vsync_mode u:object_r:vendor_hwc_prop:s0

View file

@ -17,8 +17,3 @@ set_prop(vendor_init, persist_data_wda_prop)
set_prop(vendor_init, persist_rmnet_prop)
get_prop(vendor_init, system_prop)
get_prop(vendor_init, vendor_radio_prop)
allow vendor_init thermal_link_device:dir r_dir_perms;
allow vendor_init thermal_link_device:lnk_file r_file_perms;
get_prop(vendor_init, vts_status_prop)

View file

@ -292,13 +292,10 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/sysconfig/pixel_eureka.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_eureka.xml
# Thermal HAL
# Thermal
PRODUCT_PACKAGES += \
android.hardware.thermal@2.0-service.pixel \
thermal_symlinks
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
android.hardware.thermal@1.0-impl \
android.hardware.thermal@1.0-service
# Vibrator
PRODUCT_PACKAGES += \