diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-02-19 20:31:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-19 20:31:41 +0000 |
| commit | 9baacf02dcb9e05b09eab09e619e343687e894a1 (patch) | |
| tree | 120898d8f730898facc6db621217d69b364d4692 | |
| parent | be727079a5b4f9a5b485d6763d38f5720a44f10f (diff) | |
| parent | f542a33c8de852fe3706a01e960fa0546b536e25 (diff) | |
| download | frameworks_base-9baacf02dcb9e05b09eab09e619e343687e894a1.zip frameworks_base-9baacf02dcb9e05b09eab09e619e343687e894a1.tar.gz frameworks_base-9baacf02dcb9e05b09eab09e619e343687e894a1.tar.bz2 | |
Merge "Fix build due to change in SystemServiceManager"
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index fc0e7c4..048f5aa 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -112,6 +112,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; @@ -600,17 +604,13 @@ public final class SystemServer { } try { - Slog.i(TAG, "Wi-Fi P2pService"); - mSystemServiceManager.startServiceIfExists( - "com.android.server.wifi.p2p.WifiP2pService"); + mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS); } catch (Throwable e) { reportWtf("starting Wi-Fi P2pService", e); } try { - Slog.i(TAG, "Wi-Fi Service"); - mSystemServiceManager.startServiceIfExists( - "com.android.server.wifi.WifiService"); + mSystemServiceManager.startService(WIFI_SERVICE_CLASS); } catch (Throwable e) { reportWtf("starting Wi-Fi Service", e); } |