aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Keith <javelinanddart@gmail.com>2017-10-12 13:50:46 +0200
committerPaul Keith <javelinanddart@gmail.com>2017-10-12 20:12:49 +0200
commitc05521baba488df49f17f9e88cf78bed94c62dc8 (patch)
treebb737061cbd04468edf94cf8a942f8a23a880e11
parenta891ac970988dd339c0b7ebbf7c1c7ba21660f59 (diff)
downloadandroid_packages_apps_Updater-c05521baba488df49f17f9e88cf78bed94c62dc8.tar.gz
android_packages_apps_Updater-c05521baba488df49f17f9e88cf78bed94c62dc8.tar.bz2
android_packages_apps_Updater-c05521baba488df49f17f9e88cf78bed94c62dc8.zip
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
-rw-r--r--src/org/lineageos/updater/misc/Constants.java1
-rw-r--r--src/org/lineageos/updater/misc/Utils.java3
2 files changed, 3 insertions, 1 deletions
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;
}