Snap for 6508895 from eb084efd3c483ae60f0e93d532ffc91329169f15 to mainline-release

Change-Id: I8ee01e56ebb4d319d1f60524430eb37f22875474

6 files changed, 3 insertions, 18 deletions

diff --git a/device.mk b/device.mk
index 8e5adbf0..5bd2deed 100755
--- a/device.mk
+++ b/device.mk
@@ -207,10 +207,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
     frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml \
 
-# power HAL
-PRODUCT_PACKAGES += \
-    android.hardware.power@1.3-service.pixel-libperfmgr
-
 # power.stats HAL
 PRODUCT_PACKAGES += \
     android.hardware.power.stats@1.0-service.pixel
@@ -755,3 +751,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 include hardware/google/pixel/vibrator/drv2624/device.mk
 include hardware/google/pixel/mm/device_legacy.mk
 include hardware/google/pixel/thermal/device.mk
+
+# power HAL
+-include hardware/google/pixel/power-libperfmgr/hidl/device.mk
diff --git a/sepolicy/vendor/device.te b/sepolicy/vendor/device.te
index b6834533..205526bf 100644
--- a/sepolicy/vendor/device.te
+++ b/sepolicy/vendor/device.te
@@ -7,7 +7,6 @@ type dsp_device, dev_type;
 type easel_device, dev_type;
 type hbtp_device, dev_type;
 type ipa_dev, dev_type;
-type latency_device, dev_type;
 type modem_block_device, dev_type;
 type persist_block_device, dev_type;
 type pn81a_device, dev_type;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 49efdf6d..e67868fe 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -9,7 +9,6 @@
 /dev/ipa                                        u:object_r:ipa_dev:s0
 /dev/wwan_ioctl                                 u:object_r:ipa_dev:s0
 /dev/ipaNatTable                                u:object_r:ipa_dev:s0
-/dev/cpu_dma_latency                            u:object_r:latency_device:s0
 /dev/rmnet_ctrl.*                               u:object_r:rmnet_device:s0
 /dev/at_.*                                      u:object_r:at_device:s0
 /dev/video([0-9])+                              u:object_r:video_device:s0
@@ -167,7 +166,6 @@
 /vendor/bin/oemlock_provision   u:object_r:hal_bootctl_default_exec:s0
 /vendor/bin/oemlock-bridge      u:object_r:hal_bootctl_default_exec:s0
 /vendor/bin/hw/android\.hardware\.usb@1\.1-service\.wahoo             u:object_r:hal_usb_impl_exec:s0
-/vendor/bin/hw/android\.hardware\.power@1\.3-service\.pixel-libperfmgr      u:object_r:hal_power_default_exec:s0
 /vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.pixel u:object_r:hal_power_stats_default_exec:s0
 /vendor/bin/chre                u:object_r:chre_exec:s0
 /vendor/bin/time_daemon         u:object_r:time_daemon_exec:s0
diff --git a/sepolicy/vendor/hal_power_default.te b/sepolicy/vendor/hal_power_default.te
index 47988254..b5b7a7a2 100644
--- a/sepolicy/vendor/hal_power_default.te
+++ b/sepolicy/vendor/hal_power_default.te
@@ -4,15 +4,10 @@ allow hal_power_default sysfs_graphics:file r_file_perms;
 # To do powerhint on nodes defined in powerhint.json
 allow hal_power_default sysfs_msm_subsys:dir search;
 allow hal_power_default sysfs_msm_subsys:file rw_file_perms;
-allow hal_power_default sysfs_devices_system_cpu:file rw_file_perms;
-allow hal_power_default latency_device:chr_file rw_file_perms;
 allow hal_power_default cgroup:dir search;
 allow hal_power_default cgroup:file rw_file_perms;
 allow hal_power_default sysfs_touch:file w_file_perms;
 allow hal_power_default sysfs_touch:dir search;
 
-# To get/set powerhal state property
-set_prop(hal_power_default, power_prop)
-
 # interact with thermal_config
 set_prop(hal_power_default, vendor_thermal_prop)
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
index 98a921e2..845876ab 100644
--- a/sepolicy/vendor/property.te
+++ b/sepolicy/vendor/property.te
@@ -15,7 +15,6 @@ type modem_diag_prop, property_type;
 type sys_time_prop, property_type;
 type atfwd_start_prop, property_type;
 type bluetooth_log_prop, property_type;
-type power_prop, property_type;
 type vendor_bluetooth_prop, property_type;
 type vendor_net_radio_prop, property_type;
 type vendor_radio_prop, property_type;
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 8e4f9dde..36c44e59 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -23,11 +23,6 @@ sys.modem.diag.            u:object_r:modem_diag_prop:s0
 sys.time.set               u:object_r:sys_time_prop:s0
 persist.radio.atfwd.start  u:object_r:atfwd_start_prop:s0
 sys.logger.bluetooth       u:object_r:bluetooth_log_prop:s0
-vendor.powerhal.state                           u:object_r:power_prop:s0
-vendor.powerhal.audio                           u:object_r:power_prop:s0
-vendor.powerhal.lpm                             u:object_r:power_prop:s0
-vendor.powerhal.init                            u:object_r:power_prop:s0
-vendor.powerhal.rendering                       u:object_r:power_prop:s0
 vendor.wlan.driver.version    u:object_r:vendor_wifi_version:s0
 vendor.wlan.firmware.version  u:object_r:vendor_wifi_version:s0
 persist.vendor.usb.config  u:object_r:vendor_usb_config_prop:s0