From c05521baba488df49f17f9e88cf78bed94c62dc8 Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Thu, 12 Oct 2017 13:50:46 +0200 Subject: [PATCH] Updater: Allow specifying a new device name * To allow transitions from e.g. variant->unified build * Example process, using klteusc->klte as the example: - Set ro.updater.next_device to klte in klteusc's tree - Wait for build to roll out with ro.updater.next_device - Pull klteusc from build roster Change-Id: I3c70d54de3f9e036cd8700edc4ee0b11093740d2 --- src/org/lineageos/updater/misc/Constants.java | 1 + src/org/lineageos/updater/misc/Utils.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java index 6dfc245..fe67a4d 100644 --- a/src/org/lineageos/updater/misc/Constants.java +++ b/src/org/lineageos/updater/misc/Constants.java @@ -34,6 +34,7 @@ public final class Constants { public static final String PROP_BUILD_VERSION = "ro.cm.build.version"; public static final String PROP_BUILD_VERSION_INCREMENTAL = "ro.build.version.incremental"; public static final String PROP_DEVICE = "ro.cm.device"; + public static final String PROP_NEXT_DEVICE = "ro.updater.next_device"; public static final String PROP_RELEASE_TYPE = "ro.cm.releasetype"; public static final String PROP_UPDATER_URI = "cm.updater.uri"; diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index 7713993..e5cac4f 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -149,7 +149,8 @@ public class Utils { serverUrl = context.getString(R.string.conf_update_server_url_def); } String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL); - String device = SystemProperties.get(Constants.PROP_DEVICE); + String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE, + SystemProperties.get(Constants.PROP_DEVICE)); String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT); return serverUrl + "/v1/" + device + "/" + type + "/" + incrementalVersion; }