cmsdk: Create CMSystemServer to handle our platform init.

Change-Id: I7b62978e2a284a3a1ec1ffc1d8c72545d7b0c939

1 files changed, 7 insertions, 9 deletions

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
index 397a4fe..a142f1f 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
@@ -52,7 +52,7 @@ import java.util.List;
  *
  * @hide
  */
-public class LiveLockScreenServiceBroker extends SystemService {
+public class LiveLockScreenServiceBroker extends CMSystemService {
     private static final String TAG = LiveLockScreenServiceBroker.class.getSimpleName();
     private static final boolean DEBUG = false;
 
@@ -235,16 +235,14 @@ public class LiveLockScreenServiceBroker extends SystemService {
     }
 
     @Override
+    public String getFeatureDeclaration() {
+        return CMContextConstants.Features.LIVE_LOCK_SCREEN;
+    }
+
+    @Override
     public void onStart() {
         if (DEBUG) Slog.d(TAG, "service started");
-        if (mContext.getPackageManager().hasSystemFeature(
-                CMContextConstants.Features.LIVE_LOCK_SCREEN)) {
-            publishBinderService(CMContextConstants.CM_LIVE_LOCK_SCREEN_SERVICE,
-                    new BinderService());
-        } else {
-            Slog.wtf(TAG, "CM live lock screen service started by system server but feature xml " +
-                    "not declared. Not publishing binder service!");
-        }
+        publishBinderService(CMContextConstants.CM_LIVE_LOCK_SCREEN_SERVICE, new BinderService());
     }
 
     @Override