From 551b377da9a3e92f5103a52b0b92ad72e72d6f89 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Fri, 24 Jun 2016 15:52:02 -0700
Subject: [PATCH] cmsdk: Factor CMSystemServiceHelper to common.

Change-Id: I3984d64210b9a1be71d075a8eb8b8a2cfebde183
---
 .../org/cyanogenmod/platform/internal/CMSystemServer.java  | 7 +------
 .../internal/{ => common}/CMSystemServiceHelper.java       | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename cm/lib/main/java/org/cyanogenmod/platform/internal/{ => common}/CMSystemServiceHelper.java (95%)

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMSystemServer.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMSystemServer.java
index 2b12e95..0e0b9b5 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMSystemServer.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMSystemServer.java
@@ -19,14 +19,9 @@ package org.cyanogenmod.platform.internal;
 import android.content.Context;
 import android.util.Slog;
 import com.android.server.LocalServices;
-import com.android.server.SystemService;
 import com.android.server.SystemServiceManager;
-import cyanogenmod.app.CMContextConstants;
 
-import org.cyanogenmod.platform.internal.display.LiveDisplayService;
-
-import java.util.HashMap;
-import java.util.Map;
+import org.cyanogenmod.platform.internal.common.CMSystemServiceHelper;
 
 /**
  * Base CM System Server which handles the starting and states of various CM
diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMSystemServiceHelper.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/common/CMSystemServiceHelper.java
similarity index 95%
rename from cm/lib/main/java/org/cyanogenmod/platform/internal/CMSystemServiceHelper.java
rename to cm/lib/main/java/org/cyanogenmod/platform/internal/common/CMSystemServiceHelper.java
index 5cefc22..daf8c33 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMSystemServiceHelper.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/common/CMSystemServiceHelper.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.platform.internal;
+package org.cyanogenmod.platform.internal.common;
 
 import android.content.Context;
+import org.cyanogenmod.platform.internal.CMSystemService;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;