diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2014-05-30 18:54:55 -0700 |
|---|---|---|
| committer | Yuhao Zheng <yuhaozheng@google.com> | 2014-06-02 16:48:37 -0700 |
| commit | daa618e3cd827443e7a9958c1742ecc38f87d6c8 (patch) | |
| tree | 9e85ab554a3dfe2a071c01f0bef424874b51517f /services/java/com/android | |
| parent | 0dcecc1cab9e0586ccc4725a2dab068e78207387 (diff) | |
| download | frameworks_base-daa618e3cd827443e7a9958c1742ecc38f87d6c8.zip frameworks_base-daa618e3cd827443e7a9958c1742ecc38f87d6c8.tar.gz frameworks_base-daa618e3cd827443e7a9958c1742ecc38f87d6c8.tar.bz2 | |
WifiService and WifiPasspointService hook up
- add a reference to passpoint service in wifi state machine
- break dependency loop at boot phase
Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 9174c0c..164fe05 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -127,7 +127,7 @@ public final class SystemServer { private static final String WIFI_SERVICE_CLASS = "com.android.server.wifi.WifiService"; private static final String WIFI_PASSPOINT_SERVICE_CLASS = - "com.android.server.wifi.passpoint.PasspointService"; + "com.android.server.wifi.passpoint.WifiPasspointService"; private static final String WIFI_P2P_SERVICE_CLASS = "com.android.server.wifi.p2p.WifiP2pService"; private static final String HDMI_CEC_SERVICE_CLASS = @@ -644,15 +644,15 @@ public final class SystemServer { } try { - mSystemServiceManager.startService(WIFI_SERVICE_CLASS); + mSystemServiceManager.startService(WIFI_PASSPOINT_SERVICE_CLASS); } catch (Throwable e) { - reportWtf("starting Wi-Fi Service", e); + reportWtf("starting Wi-Fi PasspointService", e); } try { - mSystemServiceManager.startService(WIFI_PASSPOINT_SERVICE_CLASS); + mSystemServiceManager.startService(WIFI_SERVICE_CLASS); } catch (Throwable e) { - reportWtf("starting Wi-Fi PasspointService", e); + reportWtf("starting Wi-Fi Service", e); } try { |