Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-09-20 16:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cherrypicks

Browse Source
This commit is contained in:
Tad 2021-07-08 22:30:16 -04:00
parent ca857913ef
commit 0c53c40b7b
5 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/LineageOS-14.1/Patch.sh
View File

@ -111,6 +111,10 @@ patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"
fi;
fi;
if enterAndClear "frameworks/opt/net/voip"; then
git pull "https://github.com/LineageOS/android_frameworks_opt_net_voip" refs/changes/74/313374/1; #n-asb-2021-07
fi;
if enterAndClear "frameworks/opt/net/wifi"; then
#Fix an issue when permision review is enabled that prevents using the Wi-Fi quick tile (AndroidHardening)
#See https://github.com/AndroidHardening/platform_frameworks_opt_net_wifi/commit/c2a2f077a902226093b25c563e0117e923c7495b

3
Scripts/LineageOS-15.1/Functions.sh
View File

@ -85,7 +85,8 @@ patchWorkspace() {
umask 0022;
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
#source build/envsetup.sh;
source build/envsetup.sh;
repopick -it O_asb_2021-07;
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

8
Scripts/LineageOS-15.1/Patch.sh
View File

@ -125,6 +125,10 @@ awk -i inplace '!/\|\| context.getResources\(\).getBoolean\(/' service/java/com/
awk -i inplace '!/com.android.internal.R.bool.config_permissionReviewRequired/' service/java/com/android/server/wifi/WifiServiceImpl.java;
fi;
if enterAndClear "frameworks/opt/net/voip"; then
git pull "https://github.com/LineageOS/android_frameworks_opt_net_voip" refs/changes/47/313347/1; #O_asb_2021-07
fi;
if enterAndClear "hardware/qcom/display"; then
git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm8084.patch" --directory msm8084;
git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm8916.patch" --directory msm8226;
@ -222,6 +226,10 @@ git revert --no-edit a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4; #Always update re
patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
fi;
if enterAndClear "system/libfmq"; then
git pull "https://github.com/LineageOS/android_system_libfmq" refs/changes/57/313357/1; #O_asb_2021-07
fi;
if enterAndClear "system/sepolicy"; then
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/26.0";

3
Scripts/LineageOS-16.0/Functions.sh
View File

@ -75,8 +75,9 @@ patchWorkspace() {
umask 0022;
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
#source build/envsetup.sh;
source build/envsetup.sh;
#repopick -it pie-firewall;
repopick -it P_asb_2021-07;
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

8
Scripts/LineageOS-16.0/Patch.sh
View File

@ -129,6 +129,10 @@ patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"
fi;
fi;
if enterAndClear "frameworks/opt/net/voip"; then
git pull "https://github.com/LineageOS/android_frameworks_opt_net_voip" refs/changes/31/313331/1; #P_asb_2021-07
fi;
if enterAndClear "hardware/qcom/display"; then
git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm8084.patch" --directory msm8084;
git apply "$DOS_PATCHES_COMMON/android_hardware_qcom_display/CVE-2019-2306-msm8916.patch" --directory msm8226;
@ -236,6 +240,10 @@ if enterAndClear "system/extras"; then
patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)
fi;
if enterAndClear "system/libfmq"; then
git pull "https://github.com/LineageOS/android_system_libfmq" refs/changes/41/313341/1; #P_asb_2021-07
fi;
if enterAndClear "system/sepolicy"; then
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/28.0";