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

Commit 43cfdfd9 authored by Vinit Deshpande's avatar Vinit Deshpande Committed by The Android Automerger
Browse files

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
parent 401b3ebf

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 =