From e38aff581eef93ea3b071685d8fb3b09ecd75a3f Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 1 May 2022 22:39:49 -0400 Subject: [PATCH] Small tweaks - Remove some more blobs - 19.1: disable FP animation (jesec) - 18.1: mata: allow major upgrades (to 19.1) (Updater patch by erfanoabdi) - mata: disable Vulkan, it doesn't work Signed-off-by: Tad --- .../330099.patch | 38 +++++++++++++++++++ .../android_frameworks_base/326692.patch | 29 ++++++++++++++ Scripts/Common/Deblob.sh | 19 +++++----- Scripts/LineageOS-18.1/Patch.sh | 3 ++ Scripts/LineageOS-19.1/Patch.sh | 2 + 5 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch create mode 100644 Patches/LineageOS-19.1/android_frameworks_base/326692.patch diff --git a/Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch b/Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch new file mode 100644 index 00000000..8c7edea4 --- /dev/null +++ b/Patches/LineageOS-18.1/android_packages_apps_Updater/330099.patch @@ -0,0 +1,38 @@ +From 10b36261bda3a4d5459f55a0dca8e55b00203354 Mon Sep 17 00:00:00 2001 +From: Erfan Abdi +Date: Tue, 26 Apr 2022 00:18:03 +0430 +Subject: [PATCH] Updater: Add prop for allowing major updates + +Change-Id: Ida461cab7f0c4953fbdd6ea4928bf14fff386056 +--- + 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 6144ed74..554098ef 100644 +--- a/src/org/lineageos/updater/misc/Constants.java ++++ b/src/org/lineageos/updater/misc/Constants.java +@@ -46,6 +46,7 @@ private Constants() { + public static final String PROP_RELEASE_TYPE = "ro.lineage.releasetype"; + public static final String PROP_UPDATER_ALLOW_DOWNGRADING = "lineage.updater.allow_downgrading"; + public static final String PROP_UPDATER_URI = "lineage.updater.uri"; ++ public static final String PROP_UPDATER_ALLOW_MAJOR_UPDATE = "lineage.updater.allow_major_update"; + + public static final String PREF_INSTALL_OLD_TIMESTAMP = "install_old_timestamp"; + public static final String PREF_INSTALL_NEW_TIMESTAMP = "install_new_timestamp"; +diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java +index 79ded8f2..c1896410 100644 +--- a/src/org/lineageos/updater/misc/Utils.java ++++ b/src/org/lineageos/updater/misc/Utils.java +@@ -113,8 +113,9 @@ public static boolean isCompatible(UpdateBaseInfo update) { + public static boolean canInstall(UpdateBaseInfo update) { + return (SystemProperties.getBoolean(Constants.PROP_UPDATER_ALLOW_DOWNGRADING, false) || + update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0)) && ++ (SystemProperties.getBoolean(Constants.PROP_UPDATER_ALLOW_MAJOR_UPDATE, false) || + update.getVersion().equalsIgnoreCase( +- SystemProperties.get(Constants.PROP_BUILD_VERSION)); ++ SystemProperties.get(Constants.PROP_BUILD_VERSION))); + } + + public static List parseJson(File file, boolean compatibleOnly) diff --git a/Patches/LineageOS-19.1/android_frameworks_base/326692.patch b/Patches/LineageOS-19.1/android_frameworks_base/326692.patch new file mode 100644 index 00000000..e848d9af --- /dev/null +++ b/Patches/LineageOS-19.1/android_frameworks_base/326692.patch @@ -0,0 +1,29 @@ +From ddf071766e4388217b14b9572eccbd3507cfa80d Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Sat, 15 Aug 2020 21:38:06 +0800 +Subject: [PATCH] Skip screen on animation when wake and unlock via biometrics + +Screen on animation is slow. Modern fingerprint sensor is *FAST*. +We need moar speed to deliver better user experience. + +* OEMs are doing this for years. + +Change-Id: I5f98259eb992b2f43872f957fcb0092412fe558c +--- + .../src/com/android/systemui/statusbar/phone/StatusBar.java | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +index a515bf54436c..9ff524f82866 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +@@ -3920,7 +3920,8 @@ public void updateScrimController() { + + boolean launchingAffordanceWithPreview = + mNotificationPanelViewController.isLaunchingAffordanceWithPreview(); +- mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview); ++ mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview ++ || mBiometricUnlockController.isWakeAndUnlock()); + + if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) { + if (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED) { diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 7b4531f3..8e5a5e05 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -51,7 +51,7 @@ echo "Deblobbing..."; blobs=$blobs"|IFAAService.apk"; blobs=$blobs"|vendor.oneplus.hardware.ifaa.*"; makes=$makes"org.ifaa.android.manager"; - manifests="mlipay|hardware.ifaa"; + manifests="alipay|mlipay|hardware.ifaa"; #AIV (DRM) [Amazon] blobs=$blobs"|libaivdrmclient.so|libAivPlay.so"; @@ -121,7 +121,7 @@ echo "Deblobbing..."; #https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/diag/ [headers] #https://source.codeaurora.org/quic/imm/imm/sources/diag/ [related?] blobs=$blobs"|[/]diag[/]|diag_callback_client|diag_dci_sample|diag_klog|diag_mdlog|diag_mdlog-getlogs|diag_mdlog-wrap|diag[/]mdm|diag_qshrink4_daemon|diag_socket_log|diag_uart_log|drmdiagapp|libdrmdiag.so|ssr_diag|test_diag|cnss_diag"; - #blobs=$blobs"|libdiag.so|libsdm-diag.so|libDiagService.so"; #XXX: Breaks qseecomd AND brightness control (?) + #blobs=$blobs"|libdiag.so|libsdm-diag.so|libDiagService.so"; #XXX: Breaks things ipcSec="4097:4294967295:2002:2950:3009:2901|4097:4294967295:3009"; #Dirac (Audio Codec + Effects) [Dirac] @@ -178,7 +178,7 @@ echo "Deblobbing..."; #blobs=$blobs"|libtpa_core.so|libdataencrypt_tpa.so|libpkip.so"; #OMAP SMC blobs=$blobs"|vendor.oneplus.hardware.drmkey.*|bin[/]hw[/]vendor.oneplus.hardware.hdcpkey.*|etc[/]init[/]vendor.oneplus.hardware.hdcpkey.*"; #OnePlus #blobs=$blobs"|vendor.oneplus.hardware.hdcpkey.*.so"; #XXX: Breaks radio, linked by libril-qc-hal-qmi.so - #manifests=$manifests"|OneplusHdcpKey"; + manifests=$manifests"|OneplusHdcpKey"; blobs=$blobs"|smc_pa.ift|drmserver.samsung"; #Samsung blobs=$blobs"|provision_device"; #blobs=$blobs"|libasfparser.so|libsavsff.so"; #Parsers @@ -242,10 +242,10 @@ echo "Deblobbing..."; #Fingerprint Reader if [ "$DOS_DEBLOBBER_REMOVE_FP" = true ]; then - blobs=$blobs"|fingerprint.*.so|libbauthserver.so|libcom_fingerprints_service.so|libegis_fp_normal_sensor_test.so|lib_fpc_tac_shared.so|libfpfactory.*.so|libsynaFpSensorTestNwd.so"; - blobs=$blobs"|fpc_early_loader"; + blobs=$blobs"|fingerprint.*.so|libbauthserver.so|libcom_fingerprints_service.so|libegis_fp_normal_sensor_test.so|lib_fpc_tac_shared.so|libfpfactory.*.so|libsynaFpSensorTestNwd.so|libbl_fp_algo.so|libBtlFpHal.so|libxuFPAlg.so|libgf_hal.so|libgoodixfingerprintd_binder.so|fp_hal_extension.so|libgf_ud_hal.so|goodix.fod.*.so"; + blobs=$blobs"|fpc_early_loader|btlfpserver"; blobs=$blobs"|fpctzappfingerprint.*"; - blobs=$blobs"|android.hardware.biometrics.fingerprint.*"; + blobs=$blobs"|android.hardware.biometrics.fingerprint.*|vendor.qti.hardware.fingerprint.*"; makes=$makes"|android.hardware.biometrics.fingerprint.*|android.hardware.fingerprint.*"; fi; @@ -557,10 +557,11 @@ echo "Deblobbing..."; #Wi-Fi [Qualcomm] #https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wigig/ [headers] #https://source.codeaurora.org/quic/qsdk/oss/wigig-utils/ [useless] - blobs=$blobs"|wifilearner"; + blobs=$blobs"|wifilearner|wigighalsvc|wigignpt|fstman"; + blobs=$blobs"|wigig-service.jar"; blobs=$blobs"|vendor.qti.hardware.wifi.wifilearner.*|vendor.qti.hardware.wigig.*"; - blobs=$blobs"|libwigig_flashaccess.so|libwigig_pciaccess.so|libwigig_utils.so|libwigigsensing.so"; - manifests=$manifests"|wifilearner"; + blobs=$blobs"|libwigig_flashaccess.so|libwigig_pciaccess.so|libwigig_utils.so|libwigigsensing.so|libwigig.*.so"; + manifests=$manifests"|wifilearner|wigig"; #Wfd (Wireless Display) [Qualcomm] #https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wfd-commonsys/ [useless] diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 99c87983..46d70c19 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -325,6 +325,7 @@ fi; if enterAndClear "packages/apps/Updater"; then applyPatch "$DOS_PATCHES/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server (DivestOS) applyPatch "$DOS_PATCHES/android_packages_apps_Updater/0002-Tor_Support.patch"; #Add Tor support (DivestOS) +applyPatch "$DOS_PATCHES/android_packages_apps_Updater/330099.patch"; #Add prop for allowing major updates (erfanoabdi) sed -i 's/PROP_BUILD_VERSION_INCREMENTAL);/PROP_BUILD_VERSION_INCREMENTAL).replaceAll("\\\\.", "");/' src/org/lineageos/updater/misc/Utils.java; #Remove periods from incremental version #TODO: Remove changelog fi; @@ -444,6 +445,8 @@ fi; if enterAndClear "device/essential/mata"; then 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 +echo "persist.graphics.vulkan.disable=true" >> vendor.prop; #mata has a graphics stack from lavender for faster OpenGL, but Vulkan appears non-functional fi; if enterAndClear "device/google/marlin"; then diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 7ac80720..24c01930 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -157,6 +157,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators-1.patc applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators-2.patch"; #Exclude Bluetooth app from Location indicators (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0021-Boot_Animation.patch"; #Use basic boot animation (DivestOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP) +applyPatch "$DOS_PATCHES/android_frameworks_base/326692.patch"; #Skip screen on animation when wake and unlock via biometrics (jesec) hardenLocationConf services/core/java/com/android/server/location/gnss/gps_debug.conf; #Harden the default GPS config changeDefaultDNS; #Change the default DNS servers sed -i 's/DEFAULT_USE_COMPACTION = false;/DEFAULT_USE_COMPACTION = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app compaction by default (GrapheneOS) @@ -392,6 +393,7 @@ fi; # if enterAndClear "device/essential/mata"; then echo "allow permissioncontroller_app tethering_service:service_manager find;" > sepolicy/private/permissioncontroller_app.te; +echo "persist.graphics.vulkan.disable=true" >> vendor.prop; #mata has a graphics stack from lavender for faster OpenGL, but Vulkan appears non-functional fi; if enterAndClear "device/google/redbull"; then