diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-05-20 11:50:17 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2014-05-20 11:50:17 -0700 |
| commit | e715e8cc00de841d690bddd1e17741a0e9b05293 (patch) | |
| tree | 9cfcf38aa77cd8debf7d2fd232404e4df289cbff /services/java | |
| parent | f564c7fe86d2aa9a7622667771d9e4bbf5518ffa (diff) | |
| download | frameworks_base-e715e8cc00de841d690bddd1e17741a0e9b05293.zip frameworks_base-e715e8cc00de841d690bddd1e17741a0e9b05293.tar.gz frameworks_base-e715e8cc00de841d690bddd1e17741a0e9b05293.tar.bz2 | |
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
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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 = |