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

Commit 9e40b804 authored by Rebecca Silberstein's avatar Rebecca Silberstein
Browse files

SystemServer: reorder wifi services start 

Start WifiService before other wifi-related services.
This is now possible since service dependencies were
removed from the WifiStateMachine constructor.

Bug: 34137732
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: frameworks/base/wifi/tests/runtests.sh
Test: manually tested wifi connection
Test: manually checked for Wifi Direct peers
Change-Id: Iad4eb7053e60542d0be72208db53cf0f83004ae2
parent 7d13f29b

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

+15 −13
Original line number Diff line number Diff line
@@ -955,6 +955,21 @@ public final class SystemServer { 
                }

                traceEnd();



                // Wifi Service must be started first for wifi-related services.

                traceBeginAndSlog("StartWifi");

                mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                traceEnd();

                traceBeginAndSlog("StartWifiScanning");

                mSystemServiceManager.startService(

                        "com.android.server.wifi.scanner.WifiScanningService");

                traceEnd();



                if (!disableRtt) {

                    traceBeginAndSlog("StartWifiRtt");

                    mSystemServiceManager.startService("com.android.server.wifi.RttService");

                    traceEnd();

                }



                if (context.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_WIFI_AWARE)) {

                    traceBeginAndSlog("StartWifiAware");
@@ -970,19 +985,6 @@ public final class SystemServer { 
                    mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);

                    traceEnd();

                }

                traceBeginAndSlog("StartWifi");

                mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                traceEnd();

                traceBeginAndSlog("StartWifiScanning");

                mSystemServiceManager.startService(

                            "com.android.server.wifi.scanner.WifiScanningService");

                traceEnd();



                if (!disableRtt) {

                    traceBeginAndSlog("StartWifiRtt");

                    mSystemServiceManager.startService("com.android.server.wifi.RttService");

                    traceEnd();

                }



                if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) ||

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {