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

Commit eae39fd1 authored by Rebecca Silberstein's avatar Rebecca Silberstein Committed by android-build-merger
Browse files

Merge "SystemServer: reorder wifi services start" 

am: 10c514d9

Change-Id: I3a918b707932084759701103c683fffed0e16cee
parents c3fbf320 10c514d9

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

+9 −7
Original line number Diff line number Diff line
@@ -834,6 +834,15 @@ public final class SystemServer { 
                }

                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);



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

                mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                mSystemServiceManager.startService(

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



                if (!disableRtt) {

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

                }



                if (context.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_WIFI_AWARE)) {

                    mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS);
@@ -845,13 +854,6 @@ public final class SystemServer { 
                        PackageManager.FEATURE_WIFI_DIRECT)) {

                    mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);

                }

                mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                mSystemServiceManager.startService(

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



                if (!disableRtt) {

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

                }



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

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {