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

Commit e2c27eed authored by Wei Liu's avatar Wei Liu Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev

parents fbd88d13 c47749f9

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -437,6 +437,7 @@ public final class SystemServer { 
        boolean disableNonCoreServices = SystemProperties.getBoolean("config.disable_noncore", false);

        boolean disableNonCoreServices = SystemProperties.getBoolean("config.disable_noncore", false);

        boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", false);

        boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", false);

        boolean disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime", false);

        boolean disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime", false);

        boolean disableRtt = SystemProperties.getBoolean("config.disable_rtt", false);

        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");

        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");





        try {

        try {
@@ -697,7 +698,9 @@ public final class SystemServer { 
                mSystemServiceManager.startService(

                mSystemServiceManager.startService(

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

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





                if (!disableRtt) {

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

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

                }





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

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

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {