summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ludvig Hansson <ludvig@google.com> 2025-03-20 08:05:42 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2025-03-20 08:05:42 -0700
commitd4b2006d16e7e2d61a36a24a43a4cb02267d8f9f (patch)
tree0ab659696282cc541e862ac2b63d6aade3666ef2
parentdbb333f3ce589f0ef07fb5187fa77332ee9ad6b1 (diff)
settings: migrate Wear auto time settings values
Migrate values that control automatic synchronization of time from Wear specific location to regular Android values. Test: upgrade from a previous version Bug: 398477634 Merged-In: I037d2fe7459fae71df88067815b30265485b0c79 Change-Id: I037d2fe7459fae71df88067815b30265485b0c79
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java48
1 files changed, 47 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 65ede9d804d0..2dcaf088bf6c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -4080,7 +4080,7 @@ public class SettingsProvider extends ContentProvider {
@VisibleForTesting
final class UpgradeController {
- private static final int SETTINGS_VERSION = 228;
+ private static final int SETTINGS_VERSION = 229;
private final int mUserId;
@@ -6336,6 +6336,52 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 228;
}
+ // Version 228: Migrate WearOS time settings
+ if (currentVersion == 228) {
+ if (getContext()
+ .getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+
+ SettingsState global = getGlobalSettingsLocked();
+
+ Setting cwAutoTime =
+ global.getSettingLocked(Global.Wearable.CLOCKWORK_AUTO_TIME);
+ if (!cwAutoTime.isNull()) {
+ boolean phone =
+ String.valueOf(Global.Wearable.SYNC_TIME_FROM_PHONE)
+ .equals(cwAutoTime.getValue());
+ boolean network =
+ String.valueOf(Global.Wearable.SYNC_TIME_FROM_NETWORK)
+ .equals(cwAutoTime.getValue());
+ global.insertSettingLocked(
+ Global.AUTO_TIME,
+ phone || network ? "1" : "0",
+ null,
+ true,
+ SettingsState.SYSTEM_PACKAGE_NAME);
+ }
+
+ Setting cwAutoTimeZone =
+ global.getSettingLocked(Global.Wearable.CLOCKWORK_AUTO_TIME_ZONE);
+ if (!cwAutoTimeZone.isNull()) {
+ boolean phone =
+ String.valueOf(Global.Wearable.SYNC_TIME_ZONE_FROM_PHONE)
+ .equals(cwAutoTimeZone.getValue());
+ boolean network =
+ String.valueOf(Global.Wearable.SYNC_TIME_ZONE_FROM_NETWORK)
+ .equals(cwAutoTimeZone.getValue());
+ global.insertSettingLocked(
+ Global.AUTO_TIME_ZONE,
+ phone || network ? "1" : "0",
+ null,
+ true,
+ SettingsState.SYSTEM_PACKAGE_NAME);
+ }
+ }
+
+ currentVersion = 229;
+ }
+
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {