From 43cfdfd9c536782d7481522a8c9d724cb67ccb2c Mon Sep 17 00:00:00 2001 From: Vinit Deshpande Date: Tue, 20 May 2014 11:50:17 -0700 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 9b3f7ac8d2dd9..6be073cf9861b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -125,7 +125,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.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 =