diff --git a/Patches/Linux b/Patches/Linux index b546a797..c4e6dd60 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit b546a797e696040fe59df1b045d5d382ff0a779e +Subproject commit c4e6dd60670a0dac94ae69e7583ec9b302c579ba diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 512e1dab..e83dfb98 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -6,7 +6,6 @@ git apply $cvePatches/CVE-2016-0774/ANY/0001.patch git apply $cvePatches/CVE-2016-7117/^4.5/0002.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch git apply $cvePatches/CVE-2017-0786/ANY/0001.patch -git apply $cvePatches/CVE-2017-11015/prima/0002.patch git apply $cvePatches/CVE-2017-11059/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatches/CVE-2017-13080/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 33ab7365..56565608 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -7,7 +7,6 @@ git apply $cvePatches/CVE-2016-8404/ANY/0001.patch git apply $cvePatches/CVE-2017-0610/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch git apply $cvePatches/CVE-2017-0786/ANY/0001.patch -git apply $cvePatches/CVE-2017-11015/prima/0002.patch git apply $cvePatches/CVE-2017-11090/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 59930c93..f93ecb0f 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -32,7 +32,6 @@ git apply $cvePatches/CVE-2017-0648/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch git apply $cvePatches/CVE-2017-0861/3.10/0001.patch git apply $cvePatches/CVE-2017-0862/3.10/0001.patch -git apply $cvePatches/CVE-2017-11015/prima/0002.patch git apply $cvePatches/CVE-2017-11016/ANY/0001.patch git apply $cvePatches/CVE-2017-11024/ANY/0001.patch git apply $cvePatches/CVE-2017-11033/3.10/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index 607d6a8a..a7ef1f31 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -72,7 +72,6 @@ git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatches/CVE-2017-10997/3.10/0001.patch git apply $cvePatches/CVE-2017-10998/3.10/0001.patch git apply $cvePatches/CVE-2017-11014/qcacld-2.0/0001.patch -git apply $cvePatches/CVE-2017-11015/qcacld-2.0/0004.patch git apply $cvePatches/CVE-2017-11019/ANY/0001.patch git apply $cvePatches/CVE-2017-11024/ANY/0001.patch git apply $cvePatches/CVE-2017-11033/3.10/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh index 4370542f..1016ffc6 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh @@ -17,7 +17,6 @@ git apply $cvePatches/CVE-2017-0751/ANY/0001.patch git apply $cvePatches/CVE-2017-0786/ANY/0001.patch git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatches/CVE-2017-11000/ANY/0002.patch -git apply $cvePatches/CVE-2017-11015/prima/0002.patch git apply $cvePatches/CVE-2017-11019/ANY/0001.patch git apply $cvePatches/CVE-2017-11059/ANY/0001.patch git apply $cvePatches/CVE-2017-11090/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 018c81c2..f087f524 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -132,7 +132,7 @@ git revert 0326bb5e41219cf502727c3aa44ebf2daa19a5b3 #re-enable doze on devices w git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/38 && git cherry-pick FETCH_HEAD #network traffic sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox sed -i 's/com.android.messaging/org.smssecure.smssecure/' core/res/res/values/config.xml; #Change default SMS app to Silence -#sed -i 's|config_permissionReviewRequired">false|config_permissionReviewRequired">true|' core/res/res/values/config.xml; #XXX: Super awesome, but breaks quick tiles +sed -i 's|config_permissionReviewRequired">false|config_permissionReviewRequired">true|' core/res/res/values/config.xml; #XXX: Super awesome, but breaks quick tiles #See https://github.com/CopperheadOS/platform_frameworks_opt_net_wifi/commit/c2a2f077a902226093b25c563e0117e923c7495b patch -p1 < $patches"android_frameworks_base/0001-Reduced_Resolution.patch" #Allow reducing resolution to save power TODO: Add 800x480 #patch -p1 < $patches"android_frameworks_base/0002-Radio.patch" #Add a QS tile to control radio power #TODO: Breaks cell and SystemUI @@ -181,6 +181,9 @@ sed -i 's/buildToolsVersion "23.0.2"/buildToolsVersion "25.0.3"/' build.gradle; enter "packages/apps/Jelly" git apply --3way $patches"android_packages_apps_Jelly/182322-3.patch" #Add option to remove identifying headers +enter "packages/apps/PackageInstaller" +patch -p1 < $patches"android_packages_apps_PackageInstaller/64d8b44.diff" #Fix an issue with Permission Review + enter "packages/apps/Settings" sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 32;/' src/com/android/settings/ChooseLockPassword.java; #Increase max password length sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; #MicroG doesn't support Backup, hide the options @@ -249,6 +252,7 @@ sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod enter "device/motorola/clark" enableDexPreOpt patch -p1 < $patches"android_device_motorola_clark/0001-Tri_State_Torch.patch" #Tri-state torch +#TODO: Remove releasetools firmware script, as it soft bricks the radio when flashing via AOSP recovery enter "device/oneplus/bacon" enableDexPreOpt