commit 8b7eaadc709166a5232b9ebf571f93b608593906
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 03 17:27:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 03 17:27:09 2024 +0000
tree 2c9bfde19afc8d325838be9b7bfc2e8dcea29404
parent 5de96fe1b10aaf1b333c44764aa013b0fb9d6b43
parent ad74fd7c386ac43ca94f6ca657ad19cb53b44a96

Merge "Re-enable NetworkTimeUpdateService for Wear" into main

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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 13c436d..ab459df 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2467,8 +2467,8 @@
                 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

diff --git a/services/java/com/android/server/flags.aconfig b/services/java/com/android/server/flags.aconfig
index 29f3871..ec74ef19 100644
--- a/services/java/com/android/server/flags.aconfig
+++ b/services/java/com/android/server/flags.aconfig
@@ -28,4 +28,11 @@
      namespace: "wear_frameworks"
      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