Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fff2217 authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android (Google) Code Review
Browse files

Merge "Fix a runtime break caused by merge conflict"

parents eeb11cde e715e8cc

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

+1 −1
Original line number Diff line number Diff line
@@ -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 =