Move DreamManagerService to its own package.
Bug: 7204211
Change-Id: Ia6cfe252647161df357a4de149a06fa1e3fd63fa
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index eeab757..10f6961 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -51,6 +51,7 @@
import com.android.server.am.ActivityManagerService;
import com.android.server.am.BatteryStatsService;
import com.android.server.display.DisplayManagerService;
+import com.android.server.dreams.DreamManagerService;
import com.android.server.input.InputManagerService;
import com.android.server.net.NetworkPolicyManagerService;
import com.android.server.net.NetworkStatsService;
diff --git a/services/java/com/android/server/DreamController.java b/services/java/com/android/server/dreams/DreamController.java
similarity index 99%
rename from services/java/com/android/server/DreamController.java
rename to services/java/com/android/server/dreams/DreamController.java
index 498e581..a6ed5ab 100644
--- a/services/java/com/android/server/DreamController.java
+++ b/services/java/com/android/server/dreams/DreamController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server;
+package com.android.server.dreams;
import android.content.ComponentName;
import android.content.Context;
diff --git a/services/java/com/android/server/DreamManagerService.java b/services/java/com/android/server/dreams/DreamManagerService.java
similarity index 98%
rename from services/java/com/android/server/DreamManagerService.java
rename to services/java/com/android/server/dreams/DreamManagerService.java
index b02ea7f..71df247 100644
--- a/services/java/com/android/server/DreamManagerService.java
+++ b/services/java/com/android/server/dreams/DreamManagerService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server;
+package com.android.server.dreams;
import static android.provider.Settings.Secure.SCREENSAVER_COMPONENTS;
import static android.provider.Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT;
@@ -28,17 +28,14 @@
import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.os.Binder;
-import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
-import android.os.Message;
import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.dreams.Dream;
import android.service.dreams.IDreamManager;
import android.util.Slog;
-import android.util.SparseArray;
import java.io.FileDescriptor;
import java.io.PrintWriter;