diff --git a/Patches/Common/android_frameworks_base/0004-Fingerprint_Lockout.patch b/Patches/Common/android_frameworks_base/0004-Fingerprint_Lockout.patch index b5b5f69b..bfef6465 100644 --- a/Patches/Common/android_frameworks_base/0004-Fingerprint_Lockout.patch +++ b/Patches/Common/android_frameworks_base/0004-Fingerprint_Lockout.patch @@ -16,7 +16,7 @@ index 06329e571b4..7c7d7008172 100644 private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30*1000; private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED = 5; - private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20; -+ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 3; ++ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 5; private static final long CANCEL_TIMEOUT_LIMIT = 3000; // max wait for onCancel() from HAL,in ms private final String mKeyguardPackage; diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0004-Fingerprint_Lockout.patch b/Patches/LineageOS-17.1/android_frameworks_base/0004-Fingerprint_Lockout.patch index a5be5bd8..2d6818d1 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0004-Fingerprint_Lockout.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0004-Fingerprint_Lockout.patch @@ -16,7 +16,7 @@ index 2159f6f2f861..4e06c591a896 100644 "com.android.server.biometrics.fingerprint.ACTION_LOCKOUT_RESET"; private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED = 5; - private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20; -+ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 3; ++ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 5; private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000; private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user"; diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch b/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch index c0b4967e..829c8a88 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch +++ b/Patches/LineageOS-18.1/android_frameworks_base/0004-Fingerprint_Lockout.patch @@ -16,7 +16,7 @@ index 5b51aa6e72ac..79451e535e45 100644 "com.android.server.biometrics.fingerprint.ACTION_LOCKOUT_RESET"; private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED = 5; - private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20; -+ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 3; ++ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 5; private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000; private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user"; diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch b/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch index 6062f6ce..228e365b 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0004-Fingerprint_Lockout.patch @@ -17,7 +17,7 @@ index dc5dace98825..efee4843aa99 100644 "com.android.server.biometrics.sensors.fingerprint.ACTION_LOCKOUT_RESET"; private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED = 5; - private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20; -+ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 3; ++ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 5; private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000; private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0004-Fingerprint_Lockout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0004-Fingerprint_Lockout.patch index 872126c9..5bbba95e 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0004-Fingerprint_Lockout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0004-Fingerprint_Lockout.patch @@ -17,7 +17,7 @@ index a0befea8e085..f884fe4654b4 100644 "com.android.server.biometrics.sensors.fingerprint.ACTION_LOCKOUT_RESET"; private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED = 5; - private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20; -+ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 3; ++ private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 5; private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000; private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user"; diff --git a/PrebuiltApps b/PrebuiltApps index 285909d6..a18563a3 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 285909d6e048fb0fcbd499b3410b5f3ce5699778 +Subproject commit a18563a3bc841c757b438e008598ecd0409e6d04 diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 53608e55..cc618462 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -176,7 +176,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/349331.patch"; #P_asb_2023-02 C applyPatch "$DOS_PATCHES/android_frameworks_base/352086.patch"; #n-asb-2023-03 Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0001-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969) -applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after three failed attempts (GrapheneOS) +applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS) if [ "$DOS_SENSORS_PERM" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Sensors.patch"; fi; #Permission for sensors access (MSe1969) sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service sed -i 's/DEFAULT_MAX_FILES_LOWRAM = 300;/DEFAULT_MAX_FILES_LOWRAM = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index b17b763d..26b575b2 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -169,7 +169,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-11.pat sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java; fi; applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969) -applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after three failed attempts (GrapheneOS) +applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0005-User_Logout.patch"; #Allow user logout (GrapheneOS) #applyPatch "$DOS_PATCHES/android_frameworks_base/0012-Private_DNS.patch"; #More 'Private DNS' options (heavily based off of a CalyxOS patch) applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Special_Permissions.patch"; #Support new special runtime permissions (GrapheneOS) diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 2bdc1152..00db358c 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -168,7 +168,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-13.pat sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java; fi; applyPatch "$DOS_PATCHES/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969) -applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after three failed attempts (GrapheneOS) +applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0005-User_Logout.patch"; #Allow user logout (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0012-Restore_SensorsOff.patch"; #Restore the Sensors Off tile (DivestOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Private_DNS.patch"; #More 'Private DNS' options (heavily based off of a CalyxOS patch) diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index f3cad7b9..c24a390c 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -127,7 +127,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patc applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0009-SystemUI_No_Permission_Review.patch"; #Allow SystemUI to directly manage Bluetooth/WiFi (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969) -applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after three failed attempts (GrapheneOS) +applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0005-User_Logout.patch"; #Allow user logout (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0011-Restore_SensorsOff.patch"; #Restore the Sensors Off tile applyPatch "$DOS_PATCHES/android_frameworks_base/0012-Private_DNS.patch"; #More 'Private DNS' options (heavily based off of a CalyxOS patch) diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 2121af30..f4b51c08 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -131,7 +131,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patc applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0009-SystemUI_No_Permission_Review.patch"; #Allow SystemUI to directly manage Bluetooth/WiFi (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969) -applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after three failed attempts (GrapheneOS) +applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0005-User_Logout.patch"; #Allow user logout (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Special_Permissions.patch"; #Support new special runtime permissions (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Special_Permissions-2.patch"; #Extend special runtime permission implementation (GrapheneOS) diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh index 14834669..2a27353e 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -149,12 +149,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1513/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1637/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1670/^6.3/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-20941/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.4/0001.patch -editKernelLocalversion "-dos.p154" +editKernelLocalversion "-dos.p153" else echo "kernel_razer_msm8998 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 73e6f564..bbe03f1a 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -133,7 +133,7 @@ git revert --no-edit 90d6826548189ca850d91692e71fcc1be426f453; #Reverts "Remove applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969) -applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after three failed attempts (GrapheneOS) +applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0005-User_Logout.patch"; #Enable secondary user logout support by default (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0005-User_Logout-a1.patch"; #Fix DevicePolicyManager#logoutUser() never succeeding (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Special_Permissions-1.patch"; #Support new special runtime permissions (GrapheneOS)