Cherrypicks

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

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";