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

Commit f52c4570 authored by Minhyeok Yun's avatar Minhyeok Yun Committed by Gerrit Code Review
Browse files

Merge "Re-enable NetworkTimeUpdateService for Wear" into android15-tests-dev

parents 533c81d9 9056d985

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

+2 −2
Original line number Diff line number Diff line
@@ -2423,8 +2423,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
@@ -15,3 +15,10 @@ flag { 
     description: "Remove TextServiceManagerService on Wear"

     bug: "323720705"

}



flag {

    name: "allow_network_time_update_service"

    namespace: "wear_systems"

    description: "Allow NetworkTimeUpdateService on Wear"

    bug: "327508176"

}
 
 No newline at end of file