From c4cdf17325d08b441b50cd6af3a832cc9c8ee634 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 16 Oct 2017 14:25:36 -0400 Subject: [PATCH] Fixes --- .../android_packages_apps_Updater/0001-Server.patch | 13 +++++++------ Scripts/LAOS-14.1_Patches.sh | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch b/Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch index 05754230..703008e3 100644 --- a/Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch +++ b/Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch @@ -1,18 +1,18 @@ -From 6c0a56705b258953b317295c0c659c2e47c99dbb Mon Sep 17 00:00:00 2001 +From 5655fa77da654b0a638670506d07137796bc3e07 Mon Sep 17 00:00:00 2001 From: Tad -Date: Fri, 6 Oct 2017 16:55:04 -0400 +Date: Mon, 16 Oct 2017 14:18:53 -0400 Subject: [PATCH] Switch to our update server -Change-Id: I826437d2ec6c3fb5358ae7ab1d369da538bd2eeb +Change-Id: I1e247d3fb6c9f2878842c0d6957792bb773c494d --- src/org/lineageos/updater/misc/Utils.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java -index 7713993..014f989 100644 +index e5cac4f..6555430 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java -@@ -144,14 +144,9 @@ public class Utils { +@@ -144,15 +144,10 @@ public class Utils { } public static String getServerURL(Context context) { @@ -21,7 +21,8 @@ index 7713993..014f989 100644 - 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; + return "https://divestos.xyz/updater.php?base=LineageOS&device=" + device + "&inc=" + incrementalVersion; diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh index f6cbcb48..c122d208 100755 --- a/Scripts/LAOS-14.1_Patches.sh +++ b/Scripts/LAOS-14.1_Patches.sh @@ -93,7 +93,6 @@ patch -p1 < $patches"android_external_sqlite/0001-Secure_Delete.patch" #Enable s enter "frameworks/base" git revert 0326bb5e41219cf502727c3aa44ebf2daa19a5b3 #re-enable doze on devices without gms git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/37 && git cherry-pick FETCH_HEAD #network traffic -git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/28/191728/1 && git cherry-pick FETCH_HEAD #revert protected apps nonsense sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox sed -i '0,/wifi,cell,battery/s/wifi,cell,battery,dnd,flashlight,rotation,bt,airplane/wifi,cell,bt,dnd,flashlight,rotation,battery,profiles,location,airplane,saver,hotspot,nfc/' packages/SystemUI/res/values/config.xml; sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; #Speedup animation scale