From 512d428d2fee11b9020a5fc791a74584d4aff986 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 31 Mar 2016 11:24:53 -0700
Subject: [PATCH] cm: Moving LiveDisplay to CMSDK

 * Also alphabetized the list of feature xmls, you filthy pigs.

Change-Id: I094a46c313be4531c6dd1af1e007a26b2476d60e
---
 config/cmsdk_common.mk                        | 13 ++++++-----
 .../org.cyanogenmod.livedisplay.xml           | 23 +++++++++++++++++++
 sepolicy/service.te                           |  1 +
 sepolicy/service_contexts                     |  1 +
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 config/permissions/org.cyanogenmod.livedisplay.xml

diff --git a/config/cmsdk_common.mk b/config/cmsdk_common.mk
index 0c922a14..b1fa533d 100644
--- a/config/cmsdk_common.mk
+++ b/config/cmsdk_common.mk
@@ -1,13 +1,14 @@
 # Permissions for cmsdk services
 PRODUCT_COPY_FILES += \
-    vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \
-    vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml \
-    vendor/cm/config/permissions/org.cyanogenmod.statusbar.xml:system/etc/permissions/org.cyanogenmod.statusbar.xml \
-    vendor/cm/config/permissions/org.cyanogenmod.profiles.xml:system/etc/permissions/org.cyanogenmod.profiles.xml \
     vendor/cm/config/permissions/org.cyanogenmod.appsuggest.xml:system/etc/permissions/org.cyanogenmod.appsuggest.xml \
-    vendor/cm/config/permissions/org.cyanogenmod.telephony.xml:system/etc/permissions/org.cyanogenmod.telephony.xml \
-    vendor/cm/config/permissions/org.cyanogenmod.performance.xml:system/etc/permissions/org.cyanogenmod.performance.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.livedisplay.xml:system/etc/permissions/org.cyanogenmod.livedisplay.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml \
     vendor/cm/config/permissions/org.cyanogenmod.partner.xml:system/etc/permissions/org.cyanogenmod.partner.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.performance.xml:system/etc/permissions/org.cyanogenmod.performance.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.profiles.xml:system/etc/permissions/org.cyanogenmod.profiles.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.statusbar.xml:system/etc/permissions/org.cyanogenmod.statusbar.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.telephony.xml:system/etc/permissions/org.cyanogenmod.telephony.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \
     vendor/cm/config/permissions/org.cyanogenmod.weather.xml:system/etc/permissions/org.cyanogenmod.weather.xml
 
 # CM Platform Library
diff --git a/config/permissions/org.cyanogenmod.livedisplay.xml b/config/permissions/org.cyanogenmod.livedisplay.xml
new file mode 100644
index 00000000..bfae5d31
--- /dev/null
+++ b/config/permissions/org.cyanogenmod.livedisplay.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <!-- The feature listed here coincides with the PerformanceManagerService declared as
+        part of the external cm service init in SystemServer. If this xml isn't present
+        on the device, the service will not be published as a binder service!
+    -->
+    <feature name="org.cyanogenmod.livedisplay" />
+</permissions>
diff --git a/sepolicy/service.te b/sepolicy/service.te
index dced33f4..c8395908 100644
--- a/sepolicy/service.te
+++ b/sepolicy/service.te
@@ -13,3 +13,4 @@ type cm_themes_service, system_api_service, system_server_service, service_manag
 type cm_iconcache_service, system_api_service, system_server_service, service_manager_type;
 type cm_livelockscreen_service, system_api_service, system_server_service, service_manager_type;
 type cm_weather_service, system_api_service, system_server_service, service_manager_type;
+type cm_livedisplay_service, system_api_service, system_server_service, service_manager_type;
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 583d7637..cb76ef13 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -13,3 +13,4 @@ cmthemes                                  u:object_r:cm_themes_service:s0
 cmiconcache                               u:object_r:cm_iconcache_service:s0
 cmlivelockscreen                          u:object_r:cm_livelockscreen_service:s0
 cmweather                                 u:object_r:cm_weather_service:s0
+cmlivedisplay                             u:object_r:cm_livedisplay_service:s0