summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAlmaz Mingaleev <mingaleev@google.com>2021-02-12 08:31:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-12 08:31:22 +0000
commitfe18f9b37f4a97cc86405f862ab364dc99d5e7eb (patch)
tree35fd181f037d84788c38f6c6d4f052de8c95a20e /core
parentfffec9a0e04f8a756f45889c1b8960569ef4f6df (diff)
parenta36c8d2b6a55e70aaf7c3584b3366e4929133cff (diff)
Merge "Prioritise NTP over NITZ in time detection." am: a36c8d2b6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f21f8288cee454ddabd06844d038041cef8afc4
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values/config.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 20cb27085661..ee45249c2030 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1547,8 +1547,8 @@
take precedence over lower ones.
See com.android.server.timedetector.TimeDetectorStrategy for available sources. -->
<string-array name="config_autoTimeSourcesPriority">
- <item>telephony</item>
<item>network</item>
+ <item>telephony</item>
</string-array>
<!-- Enables the TimeZoneRuleManager service. This is the global switch for the updateable time