Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a runtime break caused by merge conflict"

Browse Source
This commit is contained in:
Vinit Deshpande
2014-05-20 19:06:45 +00:00
committed by Android (Google) Code Review
parent eeb11cde21 e715e8cc00
commit 3fff22173c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/SystemServer.java
View File

@@ -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 =