diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0005-User_Logout.patch b/Patches/LineageOS-19.1/android_frameworks_base/0005-User_Logout.patch index adad8f0e..3da89ae7 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0005-User_Logout.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0005-User_Logout.patch @@ -23,10 +23,10 @@ index 37a84f3698c1..0ae88276ebda 100644 // one notification after enabling + one more after reboots static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index dbbbd41ceeb3..5f66da8d8431 100644 +index a7acdec27fb0..6c6a73de8b15 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -@@ -15796,11 +15796,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { +@@ -15859,11 +15859,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public boolean isLogoutEnabled() { if (!mHasFeature) { diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch index f858d90f..44cb9940 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch @@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission. 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 -index 330d2ddc0a94..77521e64d603 100644 +index f5103df80d6a..6c99d1050a9e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -4478,12 +4478,7 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -4479,12 +4479,7 @@ public class ActivityManagerService extends IActivityManager.Stub ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr); diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch index 2815be8b..0fde75eb 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch @@ -10,10 +10,10 @@ Ported from 10: 5e2898e9d21dd6802bb0b0139e7e496c41e1cd80 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 030310406949..7c4a046fda7b 100644 +index cb6ef5a8f1ae..4692ddb26491 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -1735,7 +1735,7 @@ +@@ -1736,7 +1736,7 @@ diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch index 8b83130c..73300c41 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Sensors_Permission.patch @@ -46,10 +46,10 @@ index 86fef5d9df19..5edc8d35082e 100644 android.os.Build.VERSION_CODES.DONUT, 0), new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE, diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 76811630410d..3053eb4e1e16 100644 +index 03bab921ca9a..b8971f77dd18 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -1498,6 +1498,18 @@ +@@ -1499,6 +1499,18 @@ android:description="@string/permdesc_useBiometric" android:protectionLevel="normal" /> diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0014-Automatic_Reboot.patch b/Patches/LineageOS-19.1/android_frameworks_base/0014-Automatic_Reboot.patch index 0c612251..da2804b5 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0014-Automatic_Reboot.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0014-Automatic_Reboot.patch @@ -13,10 +13,10 @@ Change-Id: If891bfbcc144c9336ba013260bad2b7c7a59c054 4 files changed, 46 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index dd5776a51f94..87ed442b0f79 100644 +index 1c5650b540f0..1f606fefeb36 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -16378,6 +16378,13 @@ public final class Settings { +@@ -16395,6 +16395,13 @@ public final class Settings { * @hide */ public static final String RESTRICTED_NETWORKING_MODE = "restricted_networking_mode"; @@ -57,10 +57,10 @@ index cdec5a47b240..3210af7bdebc 100644 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -index 597860087158..abcfcd616dd8 100644 +index 7ef58f5522ee..c08ec6f770a4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -@@ -186,6 +186,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, +@@ -187,6 +187,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, private final static String TAG = "KeyguardViewMediator"; @@ -81,7 +81,7 @@ index 597860087158..abcfcd616dd8 100644 /** * If the user has disabled the keyguard, then requests to exit, this is * how we'll ultimately let them know whether it was successful. We use this -@@ -905,6 +912,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, +@@ -907,6 +914,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, final IntentFilter delayedActionFilter = new IntentFilter(); delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION); delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION); @@ -89,7 +89,7 @@ index 597860087158..abcfcd616dd8 100644 mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter, SYSTEMUI_PERMISSION, null /* scheduler */); -@@ -1206,6 +1214,18 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, +@@ -1208,6 +1216,18 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, } } @@ -108,7 +108,7 @@ index 597860087158..abcfcd616dd8 100644 private void doKeyguardForChildProfilesLocked() { UserManager um = UserManager.get(mContext); for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) { -@@ -1223,6 +1243,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, +@@ -1225,6 +1245,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, mDelayedProfileShowingSequence++; } @@ -119,7 +119,7 @@ index 597860087158..abcfcd616dd8 100644 /** * Let's us know when the device is waking up. */ -@@ -1589,6 +1613,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, +@@ -1590,6 +1614,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(options); @@ -130,7 +130,7 @@ index 597860087158..abcfcd616dd8 100644 } private void lockProfile(int userId) { -@@ -1791,6 +1819,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, +@@ -1786,6 +1814,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, } } } @@ -143,7 +143,7 @@ index 597860087158..abcfcd616dd8 100644 } } }; -@@ -2373,6 +2407,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, +@@ -2360,6 +2394,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, mHideAnimationRun = false; adjustStatusBarLocked(); sendUserPresentBroadcast(); diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0015-Bluetooth_Timeout.patch b/Patches/LineageOS-19.1/android_frameworks_base/0015-Bluetooth_Timeout.patch index 9c21a34a..8752fce4 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0015-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0015-Bluetooth_Timeout.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Bluetooth auto turn off 2 files changed, 82 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 87ed442b0f79..069ad604024b 100644 +index 1f606fefeb36..66f100ead954 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -16385,6 +16385,12 @@ public final class Settings { +@@ -16402,6 +16402,12 @@ public final class Settings { * @hide */ public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout"; @@ -26,7 +26,7 @@ index 87ed442b0f79..069ad604024b 100644 /** diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java -index f5ff7a3d71a4..8123494599b6 100644 +index 8ceca50cbe72..8206a602e40e 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -29,6 +29,7 @@ import android.annotation.NonNull; @@ -37,7 +37,7 @@ index f5ff7a3d71a4..8123494599b6 100644 import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.BroadcastOptions; -@@ -549,6 +550,81 @@ class BluetoothManagerService extends IBluetoothManager.Stub { +@@ -568,6 +569,81 @@ class BluetoothManagerService extends IBluetoothManager.Stub { Slog.w(TAG, "Unable to resolve SystemUI's UID."); } mSystemUiUid = systemUiUid; diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0016-WiFi_Timeout.patch b/Patches/LineageOS-19.1/android_frameworks_base/0016-WiFi_Timeout.patch index b75de797..faa8d8aa 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0016-WiFi_Timeout.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0016-WiFi_Timeout.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Wi-Fi auto turn off 2 files changed, 75 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 069ad604024b..88bf06c5a1b2 100644 +index 66f100ead954..d7cc36ff4ae2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -16379,6 +16379,12 @@ public final class Settings { +@@ -16396,6 +16396,12 @@ public final class Settings { */ public static final String RESTRICTED_NETWORKING_MODE = "restricted_networking_mode"; diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch b/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch index 8a126873..a136b897 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch @@ -12,7 +12,7 @@ they get a message each time it tries again. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 7305ccc93e93..5c09243b61e6 100644 +index 07367aee8f5c..033bc8771e3c 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3597,7 +3597,7 @@ diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0023-Skip_Screen_Animation.patch b/Patches/LineageOS-19.1/android_frameworks_base/0023-Skip_Screen_Animation.patch index c831d013..629915b1 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0023-Skip_Screen_Animation.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0023-Skip_Screen_Animation.patch @@ -14,10 +14,10 @@ Change-Id: I87276128456afd9f535742477d9f76d025a12539 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java -index a0630e4831e1..00169546a799 100644 +index 7141e2801f10..dbc620f4b8f2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java -@@ -3924,8 +3924,7 @@ public class StatusBar extends SystemUI implements +@@ -3933,8 +3933,7 @@ public class StatusBar extends SystemUI implements boolean launchingAffordanceWithPreview = mNotificationPanelViewController.isLaunchingAffordanceWithPreview(); diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0024-Burnin_Protection.patch b/Patches/LineageOS-19.1/android_frameworks_base/0024-Burnin_Protection.patch index 0913483b..2f04174b 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0024-Burnin_Protection.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0024-Burnin_Protection.patch @@ -151,7 +151,7 @@ index d7b6fe9c708f..ae6c080a2f60 100644 } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java -index 00169546a799..da19bdc0de94 100644 +index dbc620f4b8f2..8595aa23d316 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -230,6 +230,7 @@ import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; @@ -182,7 +182,7 @@ index 00169546a799..da19bdc0de94 100644 }).getFragmentManager() .beginTransaction() .replace(R.id.status_bar_container, -@@ -3697,6 +3704,9 @@ public class StatusBar extends SystemUI implements +@@ -3703,6 +3710,9 @@ public class StatusBar extends SystemUI implements updateNotificationPanelTouchState(); mNotificationShadeWindowViewController.cancelCurrentTouch(); @@ -192,7 +192,7 @@ index 00169546a799..da19bdc0de94 100644 if (mLaunchCameraOnFinishedGoingToSleep) { mLaunchCameraOnFinishedGoingToSleep = false; -@@ -3783,6 +3793,9 @@ public class StatusBar extends SystemUI implements +@@ -3792,6 +3802,9 @@ public class StatusBar extends SystemUI implements } } updateScrimController(); diff --git a/Patches/LineageOS-19.1/android_frameworks_base/326692.patch b/Patches/LineageOS-19.1/android_frameworks_base/326692.patch index dda731d1..f546ffb4 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/326692.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/326692.patch @@ -14,10 +14,10 @@ Change-Id: I5f98259eb992b2f43872f957fcb0092412fe558c 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java -index 371887ba60de..a0630e4831e1 100644 +index 6552e1e9c522..7141e2801f10 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java -@@ -3924,7 +3924,8 @@ public class StatusBar extends SystemUI implements +@@ -3933,7 +3933,8 @@ public class StatusBar extends SystemUI implements boolean launchingAffordanceWithPreview = mNotificationPanelViewController.isLaunchingAffordanceWithPreview(); diff --git a/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch b/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch index 00cc5589..bad9a342 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch @@ -76,7 +76,7 @@ index a3ee437..c4532c5 100644 The array should be sorted in the same order as the touchscreen gestures advertised by the device's LineageHW impl. --> diff --git a/res/values/strings.xml b/res/values/strings.xml -index a673536..f98c2b0 100644 +index 7d489dd..ed8b29d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -532,28 +532,6 @@ diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch index 43f41996..ca252afb 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch @@ -13,7 +13,7 @@ Subject: [PATCH] add auto-reboot setting create mode 100644 src/com/android/settings/security/AutoRebootPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index 0fe13feb3e..7472ef5ecd 100644 +index 9f0af97fa5..b5fb3b02b5 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -110,6 +110,37 @@ @@ -55,7 +55,7 @@ index 0fe13feb3e..7472ef5ecd 100644 These are shown in a list dialog. --> diff --git a/res/values/strings.xml b/res/values/strings.xml -index 79ca7a465f..76aa5de4c7 100644 +index 3e0e8e186d..610e93d0b8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -650,6 +650,9 @@ diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch index 40f57130..b3b2f1b6 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add bluetooth auto-turn-off setting create mode 100644 src/com/android/settings/bluetooth/BluetoothTimeoutPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index 7472ef5ecd..b7428c8c10 100644 +index b5fb3b02b5..a396ab3630 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -39,6 +39,50 @@ @@ -67,7 +67,7 @@ index 7472ef5ecd..b7428c8c10 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 76aa5de4c7..4b53b52b5b 100644 +index 610e93d0b8..e61fdcc2a5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -27,6 +27,25 @@ diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch index 1f96a41d..bc7ac601 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add Wi-Fi timeout feature create mode 100644 src/com/android/settings/wifi/WifiTimeoutPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index b7428c8c10..a474c3bde0 100644 +index a396ab3630..abecdd1a40 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -83,6 +83,50 @@ @@ -67,7 +67,7 @@ index b7428c8c10..a474c3bde0 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 4b53b52b5b..2262ef679a 100644 +index e61fdcc2a5..0db3572289 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -46,6 +46,25 @@ diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0008-ptrace_scope.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0008-ptrace_scope.patch index dcf9c2f9..6ec0f8ce 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0008-ptrace_scope.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0008-ptrace_scope.patch @@ -12,10 +12,10 @@ Subject: [PATCH] add native debugging setting create mode 100644 src/com/android/settings/security/NativeDebugPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 2262ef679a..86fca902ec 100644 +index 0db3572289..0d68efa6c9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -13109,6 +13109,9 @@ +@@ -13116,6 +13116,9 @@ Overrides the force-dark feature to be always-on diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0009-Install_Restrictions.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0009-Install_Restrictions.patch index fb326849..841b1e1d 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0009-Install_Restrictions.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0009-Install_Restrictions.patch @@ -10,10 +10,10 @@ Subject: [PATCH] UserManager app installation restrictions 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml -index 19d4cdec54..970533145b 100644 +index 406165be65..3cad5ba33b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7737,6 +7737,8 @@ +@@ -7741,6 +7741,8 @@ Turn on phone calls Turn on phone calls & SMS diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch index 78703078..a4c3e2f4 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch @@ -12,10 +12,10 @@ Subject: [PATCH] add exec spawning toggle create mode 100644 src/com/android/settings/security/ExecSpawnPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 86fca902ec..19d4cdec54 100644 +index 0d68efa6c9..406165be65 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -13109,6 +13109,9 @@ +@@ -13116,6 +13116,9 @@ Overrides the force-dark feature to be always-on diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0011-Random_MAC.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0011-Random_MAC.patch index fa194acb..a1cc3a81 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0011-Random_MAC.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0011-Random_MAC.patch @@ -26,7 +26,7 @@ index 8111d3aaa9..de57fb3525 100644 Enable native code debugging Generate useful logs / bug reports from crashes and permit debugging native code. diff --git a/Patches/LineageOS-19.1/android_system_core/0001-Harden.patch b/Patches/LineageOS-19.1/android_system_core/0001-Harden.patch index 6f45b558..8f37d9a2 100644 --- a/Patches/LineageOS-19.1/android_system_core/0001-Harden.patch +++ b/Patches/LineageOS-19.1/android_system_core/0001-Harden.patch @@ -37,10 +37,10 @@ index c7b7b0c13..3ccacf56e 100644 CHECKCALL(mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11))); diff --git a/rootdir/init.rc b/rootdir/init.rc -index 5116c0fea..08e8938cb 100644 +index 8a385595e..b646813a8 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc -@@ -296,6 +296,17 @@ on init +@@ -334,6 +334,17 @@ on init write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000 write /proc/sys/kernel/sched_child_runs_first 0 diff --git a/Patches/LineageOS-19.1/android_system_core/0002-ptrace_scope.patch b/Patches/LineageOS-19.1/android_system_core/0002-ptrace_scope.patch index 24ddd91f..6104bdc6 100644 --- a/Patches/LineageOS-19.1/android_system_core/0002-ptrace_scope.patch +++ b/Patches/LineageOS-19.1/android_system_core/0002-ptrace_scope.patch @@ -9,10 +9,10 @@ Signed-off-by: anupritaisno1 1 file changed, 6 insertions(+) diff --git a/rootdir/init.rc b/rootdir/init.rc -index 08e8938cb..1617822a9 100644 +index b646813a8..c2bef6b8c 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc -@@ -1174,6 +1174,12 @@ on property:perf.drop_caches=3 +@@ -1226,6 +1226,12 @@ on property:perf.drop_caches=3 on property:net.tcp_def_init_rwnd=* write /proc/sys/net/ipv4/tcp_default_init_rwnd ${net.tcp_def_init_rwnd} diff --git a/Patches/LineageOS-19.1/android_system_core/0003-HM-Increase_vm_mmc.patch b/Patches/LineageOS-19.1/android_system_core/0003-HM-Increase_vm_mmc.patch index ac71bcce..d480d417 100644 --- a/Patches/LineageOS-19.1/android_system_core/0003-HM-Increase_vm_mmc.patch +++ b/Patches/LineageOS-19.1/android_system_core/0003-HM-Increase_vm_mmc.patch @@ -9,10 +9,10 @@ Signed-off-by: anupritaisno1 1 file changed, 2 insertions(+) diff --git a/rootdir/init.rc b/rootdir/init.rc -index 1617822a9..3ae6ff654 100644 +index c2bef6b8c..21212504b 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc -@@ -1035,6 +1035,8 @@ on boot +@@ -1087,6 +1087,8 @@ on boot mkdir /dev/sys/block/by-name 0755 system system symlink /sys/devices/virtual/block/${dev.mnt.blk.data} /dev/sys/block/by-name/userdata diff --git a/Patches/LineageOS-19.1/android_system_sepolicy/0003-ptrace_scope-2.patch b/Patches/LineageOS-19.1/android_system_sepolicy/0003-ptrace_scope-2.patch index faa2891c..ab10236e 100644 --- a/Patches/LineageOS-19.1/android_system_sepolicy/0003-ptrace_scope-2.patch +++ b/Patches/LineageOS-19.1/android_system_sepolicy/0003-ptrace_scope-2.patch @@ -90,7 +90,7 @@ index a51fa3a07..a294de0a3 100644 persist.logd. u:object_r:logd_prop:s0 ro.logd. u:object_r:logd_prop:s0 diff --git a/prebuilts/api/32.0/private/property_contexts b/prebuilts/api/32.0/private/property_contexts -index f235b35b7..895b8f1df 100644 +index 97c06b8f0..de078ce0f 100644 --- a/prebuilts/api/32.0/private/property_contexts +++ b/prebuilts/api/32.0/private/property_contexts @@ -54,6 +54,7 @@ persist.audio. u:object_r:audio_prop:s0 @@ -102,7 +102,7 @@ index f235b35b7..895b8f1df 100644 persist.logd. u:object_r:logd_prop:s0 ro.logd. u:object_r:logd_prop:s0 diff --git a/private/property_contexts b/private/property_contexts -index f235b35b7..895b8f1df 100644 +index 97c06b8f0..de078ce0f 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -54,6 +54,7 @@ persist.audio. u:object_r:audio_prop:s0 diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index e1e1050b..8dc6dd95 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -125,12 +125,11 @@ patchWorkspace() { 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; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314130; #adbconnection: don't spin if adbd isn't running #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default - repopick -it R_asb_2022-06; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh index 9dd182ad..3b931ad9 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh @@ -2,7 +2,6 @@ cd "$DOS_BUILD_BASE""kernel/google/msm-4.14" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0261-0262.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0263-0264.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0265-0266.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0278-0279.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch @@ -41,7 +40,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18232/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20855/^4.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-25020/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3874/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9444/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10520/ANY/0001.patch @@ -76,25 +74,24 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26401/^5.17/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28711/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28712/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28713/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28714/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28715/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28950/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35105/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38199/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39711/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1419/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.14/0002.patch @@ -104,18 +101,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1734/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1974/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1975/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.14/0002.patch @@ -125,5 +116,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-29581/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-30594/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.14/0006.patch -editKernelLocalversion "-dos.p125" +editKernelLocalversion "-dos.p116" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh index 40d900c5..f7f6c0c0 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh @@ -2,7 +2,6 @@ cd "$DOS_BUILD_BASE""kernel/google/redbull" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0224-0225.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0226-0227.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0228-0229.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0238-0239.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch @@ -62,26 +61,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4135/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26401/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28711/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28712/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28713/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28714/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28715/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30312/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35121/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45480/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0886/4.19/0003.patch @@ -89,6 +79,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/4.19/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.19/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.19/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.19/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.19/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1419/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.19/0003.patch @@ -99,16 +94,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1734/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1974/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1975/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.19/0002.patch @@ -118,10 +104,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.19/0003.patch @@ -131,5 +114,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-29581/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-30594/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.19/0005.patch -editKernelLocalversion "-dos.p131" +editKernelLocalversion "-dos.p114" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index ac23a1b7..c54c7195 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -109,8 +109,7 @@ patchWorkspace() { 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; - source build/envsetup.sh; - repopick -i 326739; #Trust: Add option to always disable USB gadgets + #source build/envsetup.sh; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 647e2227..208a48fd 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -443,7 +443,7 @@ enableAutoVarInit || true; #enableLowRam "device/sony/pioneer" "pioneer"; #Fix broken options enabled by hardenDefconfig() -#none yet +echo "CONFIG_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 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;