commit e715e8cc00de841d690bddd1e17741a0e9b05293
author Vinit Deshpande <vinitd@google.com> Tue May 20 11:50:17 2014 -0700
committer Vinit Deshpande <vinitd@google.com> Tue May 20 11:50:17 2014 -0700
tree 9cfcf38aa77cd8debf7d2fd232404e4df289cbff
parent f564c7fe86d2aa9a7622667771d9e4bbf5518ffa

Fix a runtime break caused by merge conflict

Kwd changed the name of WifiHotspotService to PasspointService; and
the reference to the name was moved in master. Merge ended up picking
up incorrect name WifiPasspointService. This change fixes that.

Bug: 15106138
Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb

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 9b3f7ac..6be073c 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -125,7 +125,7 @@
     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.WifiPasspointService";
+            "com.android.server.wifi.passpoint.PasspointService";
     private static final String WIFI_P2P_SERVICE_CLASS =
             "com.android.server.wifi.p2p.WifiP2pService";
     private static final String HDMI_CEC_SERVICE_CLASS =