diff --git a/configs/power/power_app_cfg.xml b/configs/power/power_app_cfg.xml
deleted file mode 100644
index c0f7b9c..0000000
--- a/configs/power/power_app_cfg.xml
+++ /dev/null
@@ -1,467 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/configs/power/powercontable.xml b/configs/power/powercontable.xml
deleted file mode 100644
index 422781a..0000000
--- a/configs/power/powercontable.xml
+++ /dev/null
@@ -1,376 +0,0 @@
-
-
-
-
- more
- 100
- -100
-
-
-
- more
- 100
- 0
- 0
-
-
-
- more
- 100
- -100
- 0
-
-
-
- more
- 100
- -100
-
-
-
- less
- 20
- 1
-
-
-
- more
- 20
- 1
-
-
-
- less
- 2
- 0
- -1
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 15
- 1
- 1
-
-
-
- more
- 6
- 0
-
-
-
- less
- 10000000
- 1000
- 200000
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 101
- -1
- 100
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 100000000
- 0
- -1
-
-
-
- less
- 1
- 0
- -1
-
-
-
- more
- 110
- 10
- 10
-
-
-
- more
- 2
- 0
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 1
- 0
-
-
-
- more
- 1000000
- 33
-
-
-
- more
- 1
- 0
-
-
-
- more
- 1
- 0
- CAM^
- 1
-
-
-
- less
- 5
- 0
- 2
- touch_opp^
-
-
-
- more
- 2000000000
- 10000000
- 100000000
- duration^
-
-
-
- more
- 1000000
- 0
- 100000
- active_time^
-
-
-
- less
- 4000000
- 0
- -1
-
-
-
- more
- 2000000000
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 80
- 1
-
-
-
- more
- 25855
- 0
- 4
-
-
-
- more
- 100
- 0
-
-
-
- more
- 32767
- 1
-
-
-
- more
- 32767
- 1
-
-
-
- less
- 1
- 0
-
-
-
- more
- 32767
- 8
-
-
-
- more
- 32768
- 1
-
-
-
- more
- 32768
- 1
-
-
-
- more
- 15
- 0
-
-
-
- more
- 15
- 0
-
-
-
- more
- 1
- 0
-
-
-
- more
- 32767
- 0
-
-
-
- more
- 32767
- 0
-
-
-
- more
- 16000000
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 1
- 0
-
-
-
- more
- 1
- 0
- 0
- 1
-
-
-
- more
- 1
- 0
- enable^
-
-
-
diff --git a/configs/power/powerscntbl.xml b/configs/power/powerscntbl.xml
deleted file mode 100644
index a96bbeb..0000000
--- a/configs/power/powerscntbl.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/device.mk b/device.mk
index 5d8e256..620f086 100644
--- a/device.mk
+++ b/device.mk
@@ -318,7 +318,7 @@ PRODUCT_PACKAGES += \
# Power
PRODUCT_PACKAGES += \
- android.hardware.power-service-V1-mediatek
+ android.hardware.power-service.example
PRODUCT_PACKAGES += \
android.hardware.power@1.0.vendor \
@@ -326,11 +326,6 @@ PRODUCT_PACKAGES += \
android.hardware.power@1.2.vendor \
android.hardware.power@1.3.vendor
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/power/power_app_cfg.xml:$(TARGET_COPY_OUT_VENDOR)/etc/power_app_cfg.xml \
- $(LOCAL_PATH)/configs/power/powercontable.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powercontable.xml \
- $(LOCAL_PATH)/configs/power/powerscntbl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerscntbl.xml
-
# Properties
include $(LOCAL_PATH)/vendor_logtag.mk
diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index 1aeed13..7c33a9c 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -217,18 +217,6 @@
default
-
- vendor.mediatek.hardware.mtkpower
- 1.0-1
-
- IMtkPerf
- default
-
-
- IMtkPower
- default
-
-
vendor.mediatek.hardware.mtkradioex
2.0
diff --git a/manifest.xml b/manifest.xml
index b16a88a..3f2adcb 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -225,12 +225,6 @@
hwbinder
@1.1::IMtkCodecService/default
-
- vendor.mediatek.hardware.mtkpower
- hwbinder
- @1.1::IMtkPerf/default
- @1.1::IMtkPower/default
-
vendor.mediatek.hardware.mtkradioex
hwbinder
diff --git a/proprietary-files.txt b/proprietary-files.txt
index d5a459a..02527cb 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -808,7 +808,6 @@ vendor/lib/libdre.so
vendor/lib/libfeature.stereo.provider.so
vendor/lib/libfeatureiodrv_mem.so
vendor/lib/libmfllcore.so
-vendor/lib/libmmprofile.so
vendor/lib/libmtkcam.atmseventmgr.so
vendor/lib/libmtkcam.eventcallback.so
vendor/lib/libmtkcam.logicalmodule.so
@@ -1432,7 +1431,6 @@ vendor/lib64/libmialgo_sd.so
vendor/lib64/libmialgo_utils.so
vendor/lib64/libmialgoengine.so
vendor/lib64/libmibokeh_mt6873.so
-vendor/lib64/libmmprofile.so
vendor/lib64/libmpbase.so
vendor/lib64/libmsnr.so
vendor/lib64/libmtkcam.atmseventmgr.so
@@ -2258,27 +2256,12 @@ vendor/etc/mpe.conf
vendor/etc/nhw
# Perf
-vendor/bin/hw/power_native_test_v_1_0
-vendor/bin/hw/power_native_test_v_1_1
-vendor/bin/hw/vendor.mediatek.hardware.mtkpower@1.0-service
vendor/etc/init/bootperf.rc
-vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-init.rc
-vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-service.rc
-vendor/lib/hw/power.mt6785.so
-vendor/lib/hw/vendor.mediatek.hardware.mtkpower@1.1-impl.so
vendor/lib/libmtkperf_client_vendor.so
-vendor/lib/libperfctl_vendor.so
-vendor/lib/libpowerhal.so
-vendor/lib/libpowerhalwrap_vendor.so
vendor/lib/vendor.mediatek.hardware.mtkpower@1.0.so
vendor/lib/vendor.mediatek.hardware.mtkpower@1.1.so
vendor/lib/vendor.mediatek.hardware.power@2.0.so
-vendor/lib64/hw/power.mt6785.so
-vendor/lib64/hw/vendor.mediatek.hardware.mtkpower@1.1-impl.so
vendor/lib64/libmtkperf_client_vendor.so
-vendor/lib64/libperfctl_vendor.so
-vendor/lib64/libpowerhal.so
-vendor/lib64/libpowerhalwrap_vendor.so
vendor/lib64/vendor.mediatek.hardware.mtkpower@1.0.so
vendor/lib64/vendor.mediatek.hardware.mtkpower@1.1.so
vendor/lib64/vendor.mediatek.hardware.power@1.1.so