Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move DreamManagerService to its own package." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-09-26 17:14:39 -07:00
committed by Android (Google) Code Review
parent 1974420465 cef440f2a2
commit ead9054f4e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/java/com/android/server/SystemServer.java
View File

@@ -51,6 +51,7 @@ import com.android.server.accessibility.AccessibilityManagerService;
import com.android.server.am.ActivityManagerService; import com.android.server.am.ActivityManagerService;
import com.android.server.am.BatteryStatsService; import com.android.server.am.BatteryStatsService;
import com.android.server.display.DisplayManagerService; import com.android.server.display.DisplayManagerService;
import com.android.server.dreams.DreamManagerService;
import com.android.server.input.InputManagerService; import com.android.server.input.InputManagerService;
import com.android.server.net.NetworkPolicyManagerService; import com.android.server.net.NetworkPolicyManagerService;
import com.android.server.net.NetworkStatsService; import com.android.server.net.NetworkStatsService;

2
services/java/com/android/server/DreamController.java → services/java/com/android/server/dreams/DreamController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.server; package com.android.server.dreams;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;

5
services/java/com/android/server/DreamManagerService.java → services/java/com/android/server/dreams/DreamManagerService.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * 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_COMPONENTS;
import static android.provider.Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT; import static android.provider.Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT;
@@ -28,17 +28,14 @@ import android.content.IntentFilter;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Binder; import android.os.Binder;
import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Message;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.service.dreams.Dream; import android.service.dreams.Dream;
import android.service.dreams.IDreamManager; import android.service.dreams.IDreamManager;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;