diff options
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b498c0c..91d77fb 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -29,7 +29,6 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.media.AudioService; -import android.net.wifi.p2p.WifiP2pService; import android.os.Environment; import android.os.FactoryTest; import android.os.Handler; @@ -63,6 +62,7 @@ import com.android.server.input.InputManagerService; import com.android.server.lights.LightsManager; import com.android.server.lights.LightsService; import com.android.server.media.MediaRouterService; +import com.android.server.media.MediaSessionService; import com.android.server.net.NetworkPolicyManagerService; import com.android.server.net.NetworkStatsService; import com.android.server.notification.NotificationManagerService; @@ -78,7 +78,6 @@ import com.android.server.storage.DeviceStorageMonitorService; import com.android.server.twilight.TwilightService; import com.android.server.usb.UsbService; import com.android.server.wallpaper.WallpaperManagerService; -import com.android.server.wifi.WifiService; import com.android.server.wm.WindowManagerService; import dalvik.system.VMRuntime; @@ -114,6 +113,10 @@ public final class SystemServer { "com.android.server.print.PrintManagerService"; private static final String USB_SERVICE_CLASS = "com.android.server.usb.UsbService$Lifecycle"; + private static final String WIFI_SERVICE_CLASS = + "com.android.server.wifi.WifiService"; + private static final String WIFI_P2P_SERVICE_CLASS = + "com.android.server.wifi.p2p.WifiP2pService"; private final int mFactoryTestMode; private Timer mProfilerSnapshotTimer; @@ -299,8 +302,6 @@ public final class SystemServer { NetworkStatsService networkStats = null; NetworkPolicyManagerService networkPolicy = null; ConnectivityService connectivity = null; - WifiP2pService wifiP2p = null; - WifiService wifi = null; NsdService serviceDiscovery= null; IPackageManager pm = null; WindowManagerService wm = null; @@ -603,18 +604,14 @@ public final class SystemServer { reportWtf("starting NetworkPolicy Service", e); } - try { - Slog.i(TAG, "Wi-Fi P2pService"); - wifiP2p = new WifiP2pService(context); - ServiceManager.addService(Context.WIFI_P2P_SERVICE, wifiP2p); + try { + mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS); } catch (Throwable e) { reportWtf("starting Wi-Fi P2pService", e); } - try { - Slog.i(TAG, "Wi-Fi Service"); - wifi = new WifiService(context); - ServiceManager.addService(Context.WIFI_SERVICE, wifi); + try { + mSystemServiceManager.startService(WIFI_SERVICE_CLASS); } catch (Throwable e) { reportWtf("starting Wi-Fi Service", e); } @@ -626,9 +623,6 @@ public final class SystemServer { ServiceManager.addService(Context.CONNECTIVITY_SERVICE, connectivity); networkStats.bindConnectivityManager(connectivity); networkPolicy.bindConnectivityManager(connectivity); - - wifiP2p.connectivityServiceReady(); - wifi.checkAndStartWifi(); } catch (Throwable e) { reportWtf("starting Connectivity Service", e); } @@ -887,6 +881,13 @@ public final class SystemServer { reportWtf("starting Print Service", e); } + try { + Slog.i(TAG, "MediaSessionService"); + mSystemServiceManager.startService(MediaSessionService.class); + } catch (Throwable e) { + reportWtf("starting MediaSessionService", e); + } + if (!disableNonCoreServices) { try { Slog.i(TAG, "Media Router Service"); |