Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-01-12 07:59:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Churn

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-07-12 08:37:21 -04:00
parent 717caac5c6
commit c08ce75b03
13 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch
View File

@ -10,7 +10,7 @@ requiring the READ_PHONE_STATE permission.
1 file changed, 1 insertion(+), 6 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index f5103df80d6a..6c99d1050a9e 100644 index a32aa6d895ef..fc3702c43607 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java --- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4479,12 +4479,7 @@ public class ActivityManagerService extends IActivityManager.Stub @@ -4479,12 +4479,7 @@ public class ActivityManagerService extends IActivityManager.Stub

6
Patches/LineageOS-19.1/android_frameworks_base/0021-Boot_Animation.patch
View File

@ -10,10 +10,10 @@ Change-Id: I0c87ddd9aec21fc610f3d17701192c04150308d7
1 file changed, 2 insertions(+), 8 deletions(-) 1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 6c8cab7783b6..73a98dcc56b3 100644 index f7cd1c6d78eb..429c852b4ee7 100644
--- a/cmds/bootanimation/BootAnimation.cpp --- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp
@@ -725,7 +725,7 @@ GLuint linkShader(GLuint vertexShader, GLuint fragmentShader) { @@ -742,7 +742,7 @@ GLuint linkShader(GLuint vertexShader, GLuint fragmentShader) {
} }
void BootAnimation::initShaders() { void BootAnimation::initShaders() {
@ -22,7 +22,7 @@ index 6c8cab7783b6..73a98dcc56b3 100644
GLuint vertexShader = compileShader(GL_VERTEX_SHADER, (const GLchar *)VERTEX_SHADER_SOURCE); GLuint vertexShader = compileShader(GL_VERTEX_SHADER, (const GLchar *)VERTEX_SHADER_SOURCE);
GLuint imageFragmentShader = GLuint imageFragmentShader =
compileShader(GL_FRAGMENT_SHADER, dynamicColoringEnabled compileShader(GL_FRAGMENT_SHADER, dynamicColoringEnabled
@@ -761,13 +761,7 @@ bool BootAnimation::threadLoop() { @@ -778,13 +778,7 @@ bool BootAnimation::threadLoop() {
bool result; bool result;
initShaders(); initShaders();

2
Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch
View File

@ -12,7 +12,7 @@ they get a message each time it tries again.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 07367aee8f5c..033bc8771e3c 100644 index a7d55479d2c3..35af82fb39a2 100644
--- a/core/res/res/values/config.xml --- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml
@@ -3597,7 +3597,7 @@ @@ -3597,7 +3597,7 @@

32
Patches/LineageOS-19.1/android_frameworks_base/0025-Monet_Toggle.patch
View File

@ -41,18 +41,18 @@ index d7cc36ff4ae2..72e6362c0a96 100644
* Control whether to enable adaptive sleep mode. * Control whether to enable adaptive sleep mode.
* @hide * @hide
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
index 482a70defb3f..02c1ab5f82f6 100644 index 02632cb3fc17..ea97abd4c423 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -111,7 +111,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -117,7 +117,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
private final SecureSettings mSecureSettings; private final SystemSettings mSystemSettings;
private final Executor mMainExecutor; private final Executor mMainExecutor;
private final Handler mBgHandler; private final Handler mBgHandler;
- private final boolean mIsMonetEnabled; - private final boolean mIsMonetEnabled;
private final UserTracker mUserTracker; private final UserTracker mUserTracker;
private final ConfigurationController mConfigurationController; private final ConfigurationController mConfigurationController;
private final DeviceProvisionedController mDeviceProvisionedController; private final DeviceProvisionedController mDeviceProvisionedController;
@@ -250,7 +249,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -261,7 +260,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
final boolean hadWallpaperColors = mCurrentColors.get(userId) != null; final boolean hadWallpaperColors = mCurrentColors.get(userId) != null;
int latestWallpaperType = getLatestWallpaperType(userId); int latestWallpaperType = getLatestWallpaperType(userId);
if ((flags & latestWallpaperType) != 0) { if ((flags & latestWallpaperType) != 0) {
@ -65,7 +65,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
if (DEBUG) Log.d(TAG, "got new colors: " + wallpaperColors + " where: " + flags); if (DEBUG) Log.d(TAG, "got new colors: " + wallpaperColors + " where: " + flags);
} }
@@ -347,6 +350,15 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -358,6 +361,15 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
} }
}; };
@ -81,15 +81,15 @@ index 482a70defb3f..02c1ab5f82f6 100644
@Inject @Inject
public ThemeOverlayController(Context context, BroadcastDispatcher broadcastDispatcher, public ThemeOverlayController(Context context, BroadcastDispatcher broadcastDispatcher,
@Background Handler bgHandler, @Main Executor mainExecutor, @Background Handler bgHandler, @Main Executor mainExecutor,
@@ -358,7 +370,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -369,7 +381,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
configurationController) { configurationController, SystemSettings systemSettings) {
super(context); super(context);
- mIsMonetEnabled = featureFlags.isMonetEnabled(); - mIsMonetEnabled = featureFlags.isMonetEnabled();
mConfigurationController = configurationController; mConfigurationController = configurationController;
mDeviceProvisionedController = deviceProvisionedController; mDeviceProvisionedController = deviceProvisionedController;
mBroadcastDispatcher = broadcastDispatcher; mBroadcastDispatcher = broadcastDispatcher;
@@ -408,10 +419,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -441,10 +452,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
}, },
UserHandle.USER_ALL); UserHandle.USER_ALL);
@ -100,7 +100,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor); mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor);
mConfigurationController.addCallback(mConfigurationListener); mConfigurationController.addCallback(mConfigurationListener);
@@ -419,8 +426,8 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -452,8 +459,8 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Upon boot, make sure we have the most up to date colors // Upon boot, make sure we have the most up to date colors
Runnable updateColors = () -> { Runnable updateColors = () -> {
@ -111,7 +111,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
Runnable applyColors = () -> { Runnable applyColors = () -> {
if (DEBUG) Log.d(TAG, "Boot colors: " + systemColor); if (DEBUG) Log.d(TAG, "Boot colors: " + systemColor);
mCurrentColors.put(mUserTracker.getUserId(), systemColor); mCurrentColors.put(mUserTracker.getUserId(), systemColor);
@@ -446,7 +453,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -479,7 +486,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@Override @Override
public void onFinishedGoingToSleep() { public void onFinishedGoingToSleep() {
final int userId = mUserTracker.getUserId(); final int userId = mUserTracker.getUserId();
@ -120,7 +120,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
if (colors != null) { if (colors != null) {
int flags = mDeferredWallpaperColorsFlags.get(userId); int flags = mDeferredWallpaperColorsFlags.get(userId);
@@ -457,10 +464,27 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -490,10 +497,27 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
} }
} }
}); });
@ -149,7 +149,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
final int mainColor; final int mainColor;
final int accentCandidate; final int accentCandidate;
if (currentColors == null) { if (currentColors == null) {
@@ -479,14 +503,12 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -512,14 +536,12 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
mMainWallpaperColor = mainColor; mMainWallpaperColor = mainColor;
mWallpaperAccentColor = accentCandidate; mWallpaperAccentColor = accentCandidate;
@ -170,7 +170,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
} }
updateThemeOverlays(); updateThemeOverlays();
@@ -563,7 +585,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -593,7 +615,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Let's generate system overlay if the style picker decided to override it. // Let's generate system overlay if the style picker decided to override it.
OverlayIdentifier systemPalette = categoryToPackage.get(OVERLAY_CATEGORY_SYSTEM_PALETTE); OverlayIdentifier systemPalette = categoryToPackage.get(OVERLAY_CATEGORY_SYSTEM_PALETTE);
@ -179,7 +179,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
try { try {
String colorString = systemPalette.getPackageName().toLowerCase(); String colorString = systemPalette.getPackageName().toLowerCase();
if (!colorString.startsWith("#")) { if (!colorString.startsWith("#")) {
@@ -577,20 +599,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -607,20 +629,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Color.parseColor doesn't catch any exceptions from the calls it makes // Color.parseColor doesn't catch any exceptions from the calls it makes
Log.w(TAG, "Invalid color definition: " + systemPalette.getPackageName(), e); Log.w(TAG, "Invalid color definition: " + systemPalette.getPackageName(), e);
} }
@ -201,7 +201,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
try { try {
String colorString = accentPalette.getPackageName().toLowerCase(); String colorString = accentPalette.getPackageName().toLowerCase();
if (!colorString.startsWith("#")) { if (!colorString.startsWith("#")) {
@@ -604,7 +617,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -634,7 +647,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Color.parseColor doesn't catch any exceptions from the calls it makes // Color.parseColor doesn't catch any exceptions from the calls it makes
Log.w(TAG, "Invalid color definition: " + accentPalette.getPackageName(), e); Log.w(TAG, "Invalid color definition: " + accentPalette.getPackageName(), e);
} }
@ -210,7 +210,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
try { try {
Integer.parseInt(accentPalette.getPackageName().toLowerCase(), 16); Integer.parseInt(accentPalette.getPackageName().toLowerCase(), 16);
categoryToPackage.remove(OVERLAY_CATEGORY_ACCENT_COLOR); categoryToPackage.remove(OVERLAY_CATEGORY_ACCENT_COLOR);
@@ -654,7 +667,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { @@ -692,7 +705,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
pw.println("mWallpaperAccentColor=" + Integer.toHexString(mWallpaperAccentColor)); pw.println("mWallpaperAccentColor=" + Integer.toHexString(mWallpaperAccentColor));
pw.println("mSecondaryOverlay=" + mSecondaryOverlay); pw.println("mSecondaryOverlay=" + mSecondaryOverlay);
pw.println("mNeutralOverlay=" + mNeutralOverlay); pw.println("mNeutralOverlay=" + mNeutralOverlay);

2
Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
View File

@ -76,7 +76,7 @@ index a3ee437..c4532c5 100644
The array should be sorted in the same order as the The array should be sorted in the same order as the
touchscreen gestures advertised by the device's LineageHW impl. --> touchscreen gestures advertised by the device's LineageHW impl. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7d489dd..ed8b29d 100644 index 9d88587..7ce522a 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -532,28 +532,6 @@ @@ -532,28 +532,6 @@

4
Patches/LineageOS-19.1/android_packages_apps_Settings/0004-Private_DNS.patch
View File

@ -81,10 +81,10 @@ index 12e29e693b..b6745806b5 100644
android:id="@+id/private_dns_mode_opportunistic" android:id="@+id/private_dns_mode_opportunistic"
layout="@layout/preference_widget_dialog_radiobutton"/> layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 643aea9acb..dd1e7be283 100644 index e89ab77edd..925a386cd9 100644
--- a/res/values/cm_strings.xml --- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml
@@ -74,6 +74,21 @@ @@ -78,6 +78,21 @@
<!-- Volume link notification --> <!-- Volume link notification -->
<string name="volume_link_notification_title">Link ring &amp; notification volumes</string> <string name="volume_link_notification_title">Link ring &amp; notification volumes</string>

2
Patches/LineageOS-19.1/android_packages_apps_ThemePicker/0001-Monet_Toggle.patch
View File

@ -65,7 +65,7 @@ index f2d0f21..d5f0c46 100755
diff --git a/src/com/android/customization/model/monet/MonetModeSectionController.java b/src/com/android/customization/model/monet/MonetModeSectionController.java diff --git a/src/com/android/customization/model/monet/MonetModeSectionController.java b/src/com/android/customization/model/monet/MonetModeSectionController.java
new file mode 100644 new file mode 100644
index 0000000..214d6b1 index 0000000..95796a1
--- /dev/null --- /dev/null
+++ b/src/com/android/customization/model/monet/MonetModeSectionController.java +++ b/src/com/android/customization/model/monet/MonetModeSectionController.java
@@ -0,0 +1,126 @@ @@ -0,0 +1,126 @@

4
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -75,9 +75,9 @@ commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch"
commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166";
commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166";
commentPatches android_kernel_oneplus_sm7250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2021-30324" "CVE-2021-45469"; commentPatches android_kernel_oneplus_sm7250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2021-30324" "CVE-2021-45469";
commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992" "CVE-2020-24588/4.14/0018.patch" "CVE-2021-30324" "CVE-2021-45469"; commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992" "CVE-2020-24588/4.14/0018.patch" "CVE-2021-30324" "CVE-2021-45469" "CVE-2022-1184/^5.18/0001.patch";
commentPatches android_kernel_oneplus_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600"; commentPatches android_kernel_oneplus_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600";
commentPatches android_kernel_oneplus_sm8350.sh "CVE-2018-5873"; commentPatches android_kernel_oneplus_sm8350.sh "CVE-2018-5873" "CVE-2022-1184/^5.18/0001.patch";
commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166"; commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166";
commentPatches android_kernel_samsung_apq8084.sh "0006-AndroidHardening-Kernel_Hardening/3.10/0009.patch"; commentPatches android_kernel_samsung_apq8084.sh "0006-AndroidHardening-Kernel_Hardening/3.10/0009.patch";
commentPatches android_kernel_samsung_d2.sh "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_samsung_d2.sh "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch";

2
Scripts/LineageOS-18.1/Patch.sh
View File

@ -386,7 +386,7 @@ patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --direct
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/27.0"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/27.0";
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/26.0"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/26.0";
awk -i inplace '!/true cannot be used in user builds/' Android.mk; #Allow ignoring neverallows under -user awk -i inplace '!/true cannot be used in user builds/' Android.mk; #Allow ignoring neverallows under -user
awk -i inplace '!/domain=gmscore_app/' private/seapp_contexts prebuilts/api/*/private/seapp_contexts; #Disable unused gmscore_app domain (GrapheneOS) if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then awk -i inplace '!/domain=gmscore_app/' private/seapp_contexts prebuilts/api/*/private/seapp_contexts; fi; #Disable unused gmscore_app domain (GrapheneOS)
fi; fi;
if enterAndClear "system/update_engine"; then if enterAndClear "system/update_engine"; then

2
Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
View File

@ -299,7 +299,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/4.14/0010.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.14/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.14/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0002.patch

2
Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh
View File

@ -36,7 +36,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1048/5.4/0024.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1116/5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1116/5.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1158/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1158/5.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/5.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/5.4/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/5.4/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.4/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.4/0026.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.4/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.4/0027.patch

6
Scripts/LineageOS-19.1/Functions.sh
View File

@ -97,7 +97,7 @@ buildAll() {
buildDevice alioth avb; buildDevice alioth avb;
#SD888 #SD888
buildDevice lemonade avb; buildDevice lemonade avb;
buildDevice lemonadep; buildDevice lemonadep avb;
#SD765 #SD765
buildDevice bramble avb; buildDevice bramble avb;
buildDevice redfin avb; buildDevice redfin avb;
@ -114,9 +114,7 @@ patchWorkspace() {
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
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; 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 -i 330448; #tools: Let adb secure check depend on "==0" rather than "!=1"
#repopick -it S_asb_2022-07;
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

12
Scripts/LineageOS-19.1/Patch.sh
View File

@ -208,6 +208,10 @@ if enterAndClear "frameworks/opt/net/wifi"; then
applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)
fi; fi;
if enterAndClear "hardware/qcom-caf/msm8953/audio"; then
applyPatch "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8998.patch"; #audio_extn: Fix unused parameter warning in utils.c (codeworkx)
fi;
if enterAndClear "hardware/qcom-caf/msm8998/audio"; then if enterAndClear "hardware/qcom-caf/msm8998/audio"; then
applyPatch "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8998.patch"; #audio_extn: Fix unused parameter warning in utils.c (codeworkx) applyPatch "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-8998.patch"; #audio_extn: Fix unused parameter warning in utils.c (codeworkx)
fi; fi;
@ -366,7 +370,7 @@ if enterAndClear "system/sepolicy"; then
applyPatch "$DOS_PATCHES/android_system_sepolicy/0002-protected_files.patch"; #Label protected_{fifos,regular} as proc_security (GrapheneOS) applyPatch "$DOS_PATCHES/android_system_sepolicy/0002-protected_files.patch"; #Label protected_{fifos,regular} as proc_security (GrapheneOS)
applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-1.patch"; #Allow init to control kernel.yama.ptrace_scope (GrapheneOS) applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-1.patch"; #Allow init to control kernel.yama.ptrace_scope (GrapheneOS)
applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-2.patch"; #Allow system to use persist.native_debug (GrapheneOS) applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-2.patch"; #Allow system to use persist.native_debug (GrapheneOS)
awk -i inplace '!/domain=gmscore_app/' private/seapp_contexts prebuilts/api/*/private/seapp_contexts; #Disable unused gmscore_app domain (GrapheneOS) if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then awk -i inplace '!/domain=gmscore_app/' private/seapp_contexts prebuilts/api/*/private/seapp_contexts; fi; #Disable unused gmscore_app domain (GrapheneOS)
fi; fi;
if enterAndClear "system/update_engine"; then if enterAndClear "system/update_engine"; then
@ -422,6 +426,10 @@ sed -i '/PRODUCT_SYSTEM_VERITY_PARTITION/iPRODUCT_VENDOR_VERITY_PARTITION := /de
awk -i inplace '!/vendor_sensors_dbg_prop/' sepolicy/vendor/hal_camera_default.te; #fixup awk -i inplace '!/vendor_sensors_dbg_prop/' sepolicy/vendor/hal_camera_default.te; #fixup
fi; fi;
if enterAndClear "kernel/fairphone/sdm632"; then
sed -i 's|/../../prebuilts/tools-lineage|/../../../prebuilts/tools-lineage|' lib/Makefile; #fixup typo
fi;
if enterAndClear "kernel/google/wahoo"; then if enterAndClear "kernel/google/wahoo"; then
sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO
fi; fi;
@ -449,7 +457,7 @@ enableAutoVarInit || true;
#Fix broken options enabled by hardenDefconfig() #Fix broken options enabled by hardenDefconfig()
sed -i "s/CONFIG_PREEMPT_TRACER=n/CONFIG_PREEMPT_TRACER=y/" kernel/fairphone/sdm632/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_PREEMPT_TRACER=n/CONFIG_PREEMPT_TRACER=y/" kernel/fairphone/sdm632/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
echo "CONFIG_DEBUG_FS=y" >> kernel/oneplus/sm8150/arch/arm64/configs/vendor/sm8150-perf_defconfig; echo -e "\nCONFIG_DEBUG_FS=y" >> kernel/oneplus/sm8150/arch/arm64/configs/vendor/sm8150-perf_defconfig;
sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10 sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true; rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;