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

Commit 8b7eaadc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Re-enable NetworkTimeUpdateService for Wear" into main

parents 5de96fe1 ad74fd7c

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

+2 −2
Original line number Diff line number Diff line
@@ -2467,8 +2467,8 @@ public final class SystemServer implements Dumpable { 
                reportWtf("starting RuntimeService", e);

            }

            t.traceEnd();



            if (!isWatch && !disableNetworkTime) {

            if (!disableNetworkTime && (!isWatch || (isWatch

                    && android.server.Flags.allowNetworkTimeUpdateService()))) {

                t.traceBegin("StartNetworkTimeUpdateService");

                try {

                    networkTimeUpdater = new NetworkTimeUpdateService(context);

services/java/com/android/server/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -29,3 +29,10 @@ flag { 
     description: "Allow removing VpnManagerService"

     bug: "340928692"

}



flag {

    name: "allow_network_time_update_service"

    namespace: "wear_systems"

    description: "Allow NetworkTimeUpdateService on Wear"

    bug: "327508176"

}
 
 No newline at end of file