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

Commit 342d93a9 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."

parents 3512d9eb 9086b10d

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

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

        boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", 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");



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

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



                if (!disableRtt) {

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

                }



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

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {