diff options
| author | 2024-09-03 17:27:09 +0000 | |
|---|---|---|
| committer | 2024-09-03 17:27:09 +0000 | |
| commit | 8b7eaadc709166a5232b9ebf571f93b608593906 (patch) | |
| tree | 2c9bfde19afc8d325838be9b7bfc2e8dcea29404 | |
| parent | 5de96fe1b10aaf1b333c44764aa013b0fb9d6b43 (diff) | |
| parent | ad74fd7c386ac43ca94f6ca657ad19cb53b44a96 (diff) | |
Merge "Re-enable NetworkTimeUpdateService for Wear" into main
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/flags.aconfig | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 13c436d1216d..ab459df1cdf6 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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); diff --git a/services/java/com/android/server/flags.aconfig b/services/java/com/android/server/flags.aconfig index 29f387117073..ec74ef191b81 100644 --- a/services/java/com/android/server/flags.aconfig +++ b/services/java/com/android/server/flags.aconfig @@ -28,4 +28,11 @@ flag { 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 |