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

Commit ff38f236 authored by Bo Hu's avatar Bo Hu Committed by Android (Google) Code Review
Browse files

Merge "Check wifi feature before starting wifi service"

parents 6cff5c28 91f757b5

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

+11 −8
Original line number Diff line number Diff line
@@ -1088,6 +1088,8 @@ public final class SystemServer { 
            }

            traceEnd();



            if (context.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_WIFI)) {

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

                traceBeginAndSlog("StartWifi");

                mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
@@ -1096,6 +1098,7 @@ public final class SystemServer { 
                mSystemServiceManager.startService(

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

                traceEnd();

            }



            if (!disableRtt) {

                traceBeginAndSlog("StartWifiRtt");