commit a4864472313208e4f1de02f45d3eadad237c54af
author Yuhao Zheng <yuhaozheng@google.com> Thu Apr 10 11:45:42 2014 -0700
committer Vinit Deshpande <vinitd@google.com> Sun May 18 09:41:35 2014 -0700
tree f112d0faf7a8e91d6d891f189d7bf8f883ff8104
parent 1ab9cc8029f723cc6198c013d9df1477fad2d3f9

Hotspot 2.0 framework APIs -- initial implementation

Cherry-picked from klp-wireless-dev-mirror
SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4

Bug: 5485670
Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 22e2a6e..9b3f7ac 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -124,8 +124,8 @@
             "com.android.server.usb.UsbService$Lifecycle";
     private static final String WIFI_SERVICE_CLASS =
             "com.android.server.wifi.WifiService";
-    private static final String WIFI_HOTSPOT_SERVICE_CLASS =
-            "com.android.server.wifi.hotspot.WifiHotspotService";
+    private static final String WIFI_PASSPOINT_SERVICE_CLASS =
+            "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 =
@@ -639,9 +639,9 @@
                 }
 
                 try {
-                    mSystemServiceManager.startService(WIFI_HOTSPOT_SERVICE_CLASS);
+                    mSystemServiceManager.startService(WIFI_PASSPOINT_SERVICE_CLASS);
                 } catch (Throwable e) {
-                    reportWtf("starting Wi-Fi HotspotService", e);
+                    reportWtf("starting Wi-Fi PasspointService", e);
                 }
 
                 try {