diff options
| author | 2012-09-26 17:14:39 -0700 | |
|---|---|---|
| committer | 2012-09-26 17:15:29 -0700 | |
| commit | ead9054f4efbbe2e2476ab56b082db44dab9fb28 (patch) | |
| tree | 04164f1db135fb2c4e3dd8b424bfb55d185aaa07 | |
| parent | 1974420465076bb9eee95a9e3ca1b09e3d506fd6 (diff) | |
| parent | cef440f2a2bb8b6e8d082d12a67dc21f2ee65e3c (diff) | |
Merge "Move DreamManagerService to its own package." into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/dreams/DreamController.java (renamed from services/java/com/android/server/DreamController.java) | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/dreams/DreamManagerService.java (renamed from services/java/com/android/server/DreamManagerService.java) | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index eeab757b5e75..10f696151ef1 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.accessibility.AccessibilityManagerService; 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 index 498e581b1854..a6ed5ab241cc 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 index b02ea7f768fd..71df247b087b 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.IntentFilter; 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; |