diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index b33887ae..25625c27 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -44,15 +44,6 @@
CyanogenMod
http://www.google.com/oha/rdf/ua-profile-kila.xml
-
-
- - com.aurorasoftworks.quadrant.*BenchmarkExecutionActivity,2
- - com.antutu.ABenchMark.*,2
- - .*com.antutu.benchmark.*,2
-
-
@@ -73,5 +64,6 @@
- org.cyanogenmod.platform.internal.CMTelephonyManagerService
- org.cyanogenmod.platform.internal.CMHardwareService
- org.cyanogenmod.platform.internal.AppSuggestManagerService
+ - org.cyanogenmod.platform.internal.PerformanceManagerService
diff --git a/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml b/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml
new file mode 100644
index 00000000..c4d33785
--- /dev/null
+++ b/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+ - com.aurorasoftworks.quadrant.*BenchmarkExecutionActivity,2
+ - com.antutu.ABenchMark.*,2
+ - .*com.antutu.benchmark.*,2
+
+
diff --git a/sepolicy/service.te b/sepolicy/service.te
index 8a7a425e..579e2b86 100644
--- a/sepolicy/service.te
+++ b/sepolicy/service.te
@@ -8,3 +8,4 @@ type cm_partner_interface, system_api_service, system_server_service, service_ma
type cm_telephony_service, system_api_service, system_server_service, service_manager_type;
type cm_hardware_service, system_api_service, system_server_service, service_manager_type;
type cm_app_suggest_service, system_api_service, system_server_service, service_manager_type;
+type cm_performance_service, system_api_service, system_server_service, service_manager_type;
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 324b13de..4baf0f8d 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -8,3 +8,4 @@ cmpartnerinterface u:object_r:cm_partner_interface:s0
cmtelephonymanager u:object_r:cm_telephony_service:s0
cmhardware u:object_r:cm_hardware_service:s0
cmappsuggest u:object_r:cm_app_suggest_service:s0
+cmperformance u:object_r:cm_performance_service:s0