Add display manager skeleton.
The purpose of this change is to remove direct reliance on SurfaceFlinger for describing the size and characteristics of displays. This patch also starts to make a distinction between logical displays and physical display devices. Currently, the window manager owns the concept of a logical display whereas the new display manager owns the concept of a physical display device. Change-Id: I7e0761f83f033be6c06fd1041280c21500bcabc0
This commit is contained in:
@@ -49,6 +49,7 @@ import com.android.internal.os.SamplingProfilerIntegration;
|
||||
import com.android.internal.widget.LockSettingsService;
|
||||
import com.android.server.accessibility.AccessibilityManagerService;
|
||||
import com.android.server.am.ActivityManagerService;
|
||||
import com.android.server.display.DisplayManagerService;
|
||||
import com.android.server.input.InputManagerService;
|
||||
import com.android.server.net.NetworkPolicyManagerService;
|
||||
import com.android.server.net.NetworkStatsService;
|
||||
@@ -115,6 +116,7 @@ class ServerThread extends Thread {
|
||||
|
||||
LightsService lights = null;
|
||||
PowerManagerService power = null;
|
||||
DisplayManagerService display = null;
|
||||
BatteryService battery = null;
|
||||
VibratorService vibrator = null;
|
||||
AlarmManagerService alarm = null;
|
||||
@@ -148,8 +150,13 @@ class ServerThread extends Thread {
|
||||
power = new PowerManagerService();
|
||||
ServiceManager.addService(Context.POWER_SERVICE, power);
|
||||
|
||||
Slog.i(TAG, "Display Manager");
|
||||
display = new DisplayManagerService();
|
||||
ServiceManager.addService(Context.DISPLAY_SERVICE, display);
|
||||
|
||||
Slog.i(TAG, "Activity Manager");
|
||||
context = ActivityManagerService.main(factoryTest);
|
||||
display.setContext(context);
|
||||
|
||||
Slog.i(TAG, "Telephony Registry");
|
||||
ServiceManager.addService("telephony.registry", new TelephonyRegistry(context));
|
||||
@@ -214,7 +221,7 @@ class ServerThread extends Thread {
|
||||
|
||||
// only initialize the power service after we have started the
|
||||
// lights service, content providers and the battery service.
|
||||
power.init(context, lights, ActivityManagerService.self(), battery);
|
||||
power.init(context, lights, ActivityManagerService.self(), battery, display);
|
||||
|
||||
Slog.i(TAG, "Alarm Manager");
|
||||
alarm = new AlarmManagerService(context);
|
||||
@@ -225,7 +232,7 @@ class ServerThread extends Thread {
|
||||
ActivityManagerService.self());
|
||||
|
||||
Slog.i(TAG, "Window Manager");
|
||||
wm = WindowManagerService.main(context, power,
|
||||
wm = WindowManagerService.main(context, power, display,
|
||||
factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL,
|
||||
!firstBoot, onlyCore);
|
||||
ServiceManager.addService(Context.WINDOW_SERVICE, wm);
|
||||
|
||||
Reference in New Issue
Block a user