summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2020-10-27 10:14:24 (GMT)
committer gerrit autosubmit <gerrit.autosubmit@aml-code-master.amlogic.com>2020-11-18 05:31:40 (GMT)
commit9dfd99beb045053e157fef4d64860efb7817b684 (patch)
treeccbafdfec403aa35ae31a945eae7c7e0e4a11fd1
parent45887c1671db5eeb2f7d3e6b8c0dc2a53c873d87 (diff)
downloadcommon-9dfd99beb045053e157fef4d64860efb7817b684.zip
common-9dfd99beb045053e157fef4d64860efb7817b684.tar.gz
common-9dfd99beb045053e157fef4d64860efb7817b684.tar.bz2
power: add power AIDL service selabel [1/2]
PD#SWPL-35782 Problem: Some deprecated power HIDL services are not used on R. Solution: remove deprecated power HIDL service and add power AIDL service for new devices. Verify: Ohm Change-Id: Ida8976ce5d61d767170558763cded66a4f51fa53
Diffstat
-rw-r--r--core_amlogic.mk6
-rwxr-xr-xhidl_manifests/newdevices/manifest_common.xml8
-rwxr-xr-x[-rw-r--r--]sepolicy/file_contexts4
3 files changed, 4 insertions, 14 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk
index d8b754f..e23db81 100644
--- a/core_amlogic.mk
+++ b/core_amlogic.mk
@@ -389,7 +389,7 @@ PRODUCT_PACKAGES += \
android.hardware.power@1.0-service
else
PRODUCT_PACKAGES += \
- android.hardware.power-service.example
+ android.hardware.power.aidl-service.droidlogic
endif
#Memtack HAL
@@ -483,10 +483,6 @@ PRODUCT_PACKAGES += \
android.frameworks.bufferhub@1.0-impl \
android.frameworks.bufferhub@1.0-service
-# PowerStats HAL
-PRODUCT_PACKAGES += \
- android.hardware.power.stats@1.0-service.mock
-
#Atrace HAL
PRODUCT_PACKAGES += \
android.hardware.atrace@1.0-service
diff --git a/hidl_manifests/newdevices/manifest_common.xml b/hidl_manifests/newdevices/manifest_common.xml
index 76b2d97..aa3ad48 100755
--- a/hidl_manifests/newdevices/manifest_common.xml
+++ b/hidl_manifests/newdevices/manifest_common.xml
@@ -9,14 +9,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.power</name>
- <transport>hwbinder</transport>
- <interface>
- <name>IPower</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.memtrack</name>
<transport>hwbinder</transport>
<version>1.0</version>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index a8eeaec..4a21850 100644..100755
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -344,7 +344,9 @@
/vendor/bin/hw/android\.hardware\.dumpstate@1\.1-service.droidlogic u:object_r:hal_dumpstate_default_exec:s0
/vendor/bin/hw/android\.hardware\.drm@1\.3-service\.widevine u:object_r:hal_drm_default_exec:s0
/vendor/bin/hw/android\.hardware\.drm@1\.3-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0
-/vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.mock u:object_r:hal_power_stats_default_exec:s0
+/vendor/bin/hw/android\.hardware\.power\.aidl-service.droidlogic u:object_r:hal_power_default_exec:s0
+
+
/vendor/bin/hw/android\.hardware\.graphics\.composer@2\.[1-4]-service\.droidlogic u:object_r:hal_graphics_composer_default_exec:s0
/vendor/bin/hw/android\.hardware\.thermal@2\.0-service.droidlogic u:object_r:hal_thermal_default_exec:s0
/vendor/bin/hw/android\.hardware\.oemlock@1\.0-service\.droidlogic u:object_r:hal_oemlock_default_exec:s0