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

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

Merge "SystemServer: reorder wifi services start" am: 10c514d9 

am: eae39fd1

Change-Id: I723d8b96f5d5406e8f948885a845993e755ab0d8
parents 4a0a4664 eae39fd1

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

+9 −7
Original line number Diff line number Diff line
@@ -836,6 +836,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);
@@ -847,13 +856,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)) {