From 178e1273383275d61dbae1bacbcc0a5e528308a7 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 3 Dec 2022 13:50:49 -0500 Subject: [PATCH] Small tweaks + churn Fixes recovery not booting on 20.0 Signed-off-by: Tad --- .../android_frameworks_base/0005-User_Logout-a1.patch | 2 +- .../android_frameworks_base/0005-User_Logout.patch | 2 +- .../android_packages_apps_Updater/0001-Server.patch | 4 ++-- .../android_packages_apps_Updater/0002-Tor_Support.patch | 8 ++++---- PrebuiltApps | 2 +- Scripts/LineageOS-20.0/Functions.sh | 3 +-- Scripts/LineageOS-20.0/Patch.sh | 5 +++++ Scripts/WebView_Update_Repo.sh | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch index 1bffb4ad..456e11ab 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch @@ -10,7 +10,7 @@ in both callers of this method (both of which are "End session" buttons), making 1 file changed, 6 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index 4be9c1a1d54a..a33f4fa55b53 100644 +index 787f88be125e..e1e5e7af1951 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -11155,6 +11155,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch index e1f44131..e8e9ec68 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch @@ -23,7 +23,7 @@ index 0c69067ab131..ef3213b68bfe 100644 // one notification after enabling + one more after reboots static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index 7bbcea21ca09..4be9c1a1d54a 100644 +index fb526ec2fcf5..787f88be125e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -16083,11 +16083,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { diff --git a/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch b/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch index 374e514a..72f11695 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Updater/0001-Server.patch @@ -9,10 +9,10 @@ Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5 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 -index 79ded8f..69a5252 100644 +index 011dc8a..914ae6a 100644 --- a/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 device = SystemProperties.get(Constants.PROP_NEXT_DEVICE, SystemProperties.get(Constants.PROP_DEVICE)); diff --git a/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch b/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch index 267dd420..5ea27e8d 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch @@ -127,7 +127,7 @@ index 9c56f0b..766fb83 100644 boolean enableABPerfMode = abPerfMode.isChecked(); mUpdaterService.getUpdaterController().setPerformanceMode(enableABPerfMode); diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/src/org/lineageos/updater/UpdatesCheckReceiver.java -index 7fa9cd5..962fd00 100644 +index 9f45423..382fbd4 100644 --- a/src/org/lineageos/updater/UpdatesCheckReceiver.java +++ b/src/org/lineageos/updater/UpdatesCheckReceiver.java @@ -110,10 +110,14 @@ public class UpdatesCheckReceiver extends BroadcastReceiver { @@ -308,10 +308,10 @@ index 6144ed7..37e81d8 100644 public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; 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 -index 69a5252..2b42726 100644 +index 914ae6a..3eee6a7 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java -@@ -44,6 +44,7 @@ import java.io.BufferedReader; +@@ -45,6 +45,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; @@ -319,7 +319,7 @@ index 69a5252..2b42726 100644 import java.util.ArrayList; import java.util.Enumeration; import java.util.HashSet; -@@ -149,11 +150,75 @@ public class Utils { +@@ -150,11 +151,75 @@ public class Utils { return updates; } diff --git a/PrebuiltApps b/PrebuiltApps index f754766d..8f968972 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit f754766d7c1715518507f5502462a0197a01a2ab +Subproject commit 8f968972b5786251e83b58ff23baf2c5fd615699 diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index a7e0dda2..7120ff32 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -103,8 +103,7 @@ patchWorkspace() { gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; source build/envsetup.sh; - repopick -i 343790; #usb: have enableUsbDataSignal() call queryPortStatus() if successful - repopick -i 343791; #UsbManager: enableUsbDataSignal: return early if HAL version is too old + repopick -i 344891; #fixup! Rewrite trust USB restriction handling #repopick -it T_tzdb2022f; sh "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index dca4f0ac..77ed9642 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -415,7 +415,12 @@ if enterAndClear "device/google/redbull"; then awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; #fix compile after hardenDefconfig fi; +if enterAndClear "device/google/wahoo"; then +git revert --no-edit 4e9cf40ae5e8a334989b46405ab09dba575f61fa; #revert compressed ramdisk due to potential breakage +fi; + if enterAndClear "kernel/google/wahoo"; then +git revert --no-edit 4fc7c2f4d9a187396cc6efb4a0cc003850f3f79d; #revert compressed ramdisk due to potential breakage sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO fi; diff --git a/Scripts/WebView_Update_Repo.sh b/Scripts/WebView_Update_Repo.sh index 542286d6..01553837 100644 --- a/Scripts/WebView_Update_Repo.sh +++ b/Scripts/WebView_Update_Repo.sh @@ -16,7 +16,7 @@ umask 0022; set -uo pipefail; -export version="108.0.5359.61-1"; +export version="108.0.5359.79-1"; export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0; export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk"; export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk";