Compare commits

...

2 Commits

Author SHA1 Message Date
Tad
48ce0ad7d9 Fixup + Churn
Signed-off-by: Tad <tad@spotco.us>
2023-02-01 21:36:47 -05:00
Tad
64e717151a
19.1: mata: allow major upgrade
Signed-off-by: Tad <tad@spotco.us>
2023-02-01 20:25:47 -05:00
6 changed files with 12 additions and 10 deletions

View File

@ -12,10 +12,10 @@ Unlike 11, enable LTE only when World mode is enabled also and ignore CarrierCon
4 files changed, 41 insertions(+), 4 deletions(-) 4 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/res/values/arrays.xml b/res/values/arrays.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a08ac6d939..8077b9e8c8 100644 index b7b7c99c1f..ad7e2984a3 100644
--- a/res/values/arrays.xml --- a/res/values/arrays.xml
+++ b/res/values/arrays.xml +++ b/res/values/arrays.xml
@@ -1488,6 +1488,9 @@ @@ -1494,6 +1494,9 @@
<item>4</item> <!-- AutofillManager.FLAG_ADD_CLIENT_VERBOSE --> <item>4</item> <!-- AutofillManager.FLAG_ADD_CLIENT_VERBOSE -->
</string-array> </string-array>
@ -25,7 +25,7 @@ index a08ac6d939..8077b9e8c8 100644
<string-array name="enabled_networks_choices" translatable="false"> <string-array name="enabled_networks_choices" translatable="false">
<item>@string/network_lte</item> <item>@string/network_lte</item>
<item>@string/network_3G</item> <item>@string/network_3G</item>
@@ -1577,7 +1580,7 @@ @@ -1583,7 +1586,7 @@
<item>CDMA + LTE/EvDo</item> <item>CDMA + LTE/EvDo</item>
<item>GSM/WCDMA/LTE</item> <item>GSM/WCDMA/LTE</item>
<item>LTE/CDMA/EvDo/GSM/WCDMA</item> <item>LTE/CDMA/EvDo/GSM/WCDMA</item>

View File

@ -9,10 +9,10 @@ Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
1 file changed, 2 insertions(+), 9 deletions(-) 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 79ded8f..69a5252 100644 index c189641..980bed6 100644
--- a/src/org/lineageos/updater/misc/Utils.java --- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java
@@ -153,16 +153,9 @@ public class Utils { @@ -154,16 +154,9 @@ public class Utils {
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL); String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE, String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE)); SystemProperties.get(Constants.PROP_DEVICE));

View File

@ -296,7 +296,7 @@ index b9c4b5d..b94fff0 100644
mClient.connect(); mClient.connect();
int responseCode = mClient.getResponseCode(); int responseCode = mClient.getResponseCode();
diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
index 6144ed7..37e81d8 100644 index 554098e..dbdc983 100644
--- a/src/org/lineageos/updater/misc/Constants.java --- a/src/org/lineageos/updater/misc/Constants.java
+++ b/src/org/lineageos/updater/misc/Constants.java +++ b/src/org/lineageos/updater/misc/Constants.java
@@ -30,6 +30,7 @@ public final class Constants { @@ -30,6 +30,7 @@ public final class Constants {
@ -308,7 +308,7 @@ index 6144ed7..37e81d8 100644
public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 69a5252..2b42726 100644 index 980bed6..73985da 100644
--- a/src/org/lineageos/updater/misc/Utils.java --- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java
@@ -44,6 +44,7 @@ import java.io.BufferedReader; @@ -44,6 +44,7 @@ import java.io.BufferedReader;
@ -319,7 +319,7 @@ index 69a5252..2b42726 100644
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
@@ -149,11 +150,75 @@ public class Utils { @@ -150,11 +151,75 @@ public class Utils {
return updates; return updates;
} }

View File

@ -74,9 +74,10 @@ patchWorkspace() {
verifyAllPlatformTags; verifyAllPlatformTags;
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
#source build/envsetup.sh; source build/envsetup.sh;
#repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -ift twelve-bt-sbc-hd-dualchannel;
#repopick -it twelve-colors; #repopick -it twelve-colors;
repopick -if 330099; #Updater: Add prop for allowing major updates
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

View File

@ -429,6 +429,7 @@ fi;
# #
if enterAndClear "device/essential/mata"; then if enterAndClear "device/essential/mata"; then
echo "allow permissioncontroller_app tethering_service:service_manager find;" > sepolicy/private/permissioncontroller_app.te; echo "allow permissioncontroller_app tethering_service:service_manager find;" > sepolicy/private/permissioncontroller_app.te;
echo "lineage.updater.allow_major_update=true" >> system.prop; #mata has semi-broken recovery, allow major updates via Updater
fi; fi;
if enterAndClear "kernel/fairphone/sdm632"; then if enterAndClear "kernel/fairphone/sdm632"; then

View File

@ -16,7 +16,7 @@
umask 0022; umask 0022;
set -uo pipefail; set -uo pipefail;
export version="109.0.5414.118-1"; export version="110.0.5481.61-1";
export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0; export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0;
export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk"; export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk";
export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk"; export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk";