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

Commit 4b69aca6 authored by Minhyeok Yun's avatar Minhyeok Yun Committed by Android (Google) Code Review
Browse files

Merge "Remove allow_network_time_update_service flag" into main

parents fc762204 8b3878a0

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

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

            }

            t.traceEnd();

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

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

            if (!disableNetworkTime) {

                t.traceBegin("StartNetworkTimeUpdateService");

                try {

                    networkTimeUpdater = new NetworkTimeUpdateService(context);

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

+0 −7
Original line number Diff line number Diff line
@@ -45,13 +45,6 @@ flag { 
     is_fixed_read_only: true

}



flag {

    name: "allow_network_time_update_service"

    namespace: "wear_systems"

    description: "Allow NetworkTimeUpdateService on Wear"

    bug: "327508176"

}



flag {

     name: "remove_game_manager_service_from_wear"

     namespace: "wear_frameworks"