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

Commit 50fcdf9d authored by Chenjie Luo's avatar Chenjie Luo Committed by Android Git Automerger
Browse files

am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to... 

am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev

* commit 'fe09db1e':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
parents 0ee1d87c fe09db1e

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

+1 −3
Original line number Diff line number Diff line
@@ -416,8 +416,6 @@ public final class SystemServer { 
        boolean disableSystemUI = SystemProperties.getBoolean("config.disable_systemui", false);

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

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

        boolean disableNetworkTimeProtocol = SystemProperties.getBoolean("config.disable_networktimeprotocol",

                false);

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



        try {
@@ -865,7 +863,7 @@ public final class SystemServer { 
                reportWtf("starting SamplingProfiler Service", e);

            }



            if (!disableNetwork && !disableNetworkTimeProtocol) {

            if (!disableNetwork) {

                try {

                    Slog.i(TAG, "NetworkTimeUpdateService");

                    networkTimeUpdater = new NetworkTimeUpdateService(context);