From 29c9826c11d723a15cc45466555c29d06b3fea87 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 10 Dec 2022 20:39:50 -0500 Subject: [PATCH] 20.0: QPR1 churn Signed-off-by: Tad --- .../0001-constify_JNINativeMethod.patch | 4 +- .../android_build_soong/0002-hm_apex.patch | 4 +- .../0005-User_Logout-a1.patch | 4 +- .../0005-User_Logout.patch | 4 +- .../0007-Always_Restict_Serial.patch | 4 +- .../0013-Special_Permissions-1.patch | 20 +++++----- .../0013-Special_Permissions-10.patch | 4 +- .../0013-Special_Permissions-2.patch | 8 ++-- .../0013-Special_Permissions-3.patch | 12 +++--- .../0013-Special_Permissions-5.patch | 4 +- .../0014-Automatic_Reboot.patch | 30 +++++++-------- .../0015-Bluetooth_Timeout.patch | 4 +- .../0015-System_Server_Extensions.patch | 6 +-- .../0015-WiFi_Timeout.patch | 4 +- .../0022-Ignore_StatementService_ANR.patch | 4 +- .../0023-Skip_Screen_Animation.patch | 4 +- .../0028-Remove_Legacy_Package_Query.patch | 4 +- .../0001-Icon_Cache.patch | 6 +-- .../0001-Sensors_Permission-a1.patch | 6 +-- .../0001-Random_MAC.patch | 8 ++-- .../0004-Private_DNS.patch | 4 +- .../0005-Automatic_Reboot.patch | 6 +-- .../0006-Bluetooth_Timeout.patch | 2 +- .../0007-WiFi_Timeout.patch | 2 +- .../0008-ptrace_scope.patch | 6 +-- .../0009-Install_Restrictions.patch | 18 ++++----- .../0010-exec_spawning_toggle.patch | 6 +-- .../0011-Random_MAC.patch | 4 +- .../0012-hosts_toggle.patch | 6 +-- .../0013-Captive_Portal_Toggle.patch | 4 +- .../android_system_core/0001-Harden.patch | 2 +- .../0002-ptrace_scope.patch | 4 +- .../0003-HM-Increase_vm_mmc.patch | 4 +- .../0003-ptrace_scope-2.patch | 4 +- .../android_kernel_google_msm-4.14.sh | 38 +------------------ .../android_kernel_google_redbull.sh | 37 +----------------- Scripts/LineageOS-20.0/Functions.sh | 8 ++-- 37 files changed, 116 insertions(+), 183 deletions(-) diff --git a/Patches/LineageOS-20.0/android_art/0001-constify_JNINativeMethod.patch b/Patches/LineageOS-20.0/android_art/0001-constify_JNINativeMethod.patch index 27bdb3a0..106bc519 100644 --- a/Patches/LineageOS-20.0/android_art/0001-constify_JNINativeMethod.patch +++ b/Patches/LineageOS-20.0/android_art/0001-constify_JNINativeMethod.patch @@ -95,10 +95,10 @@ index 607395d308..f3d84e57a8 100644 "()[Ljava/lang/String;"), }; diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc -index d714206241..9a75010174 100644 +index ecb901044a..1ad2f67810 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc -@@ -922,7 +922,7 @@ static void DexFile_setTrusted(JNIEnv* env, jclass, jobject j_cookie) { +@@ -923,7 +923,7 @@ static void DexFile_setTrusted(JNIEnv* env, jclass, jobject j_cookie) { } } diff --git a/Patches/LineageOS-20.0/android_build_soong/0002-hm_apex.patch b/Patches/LineageOS-20.0/android_build_soong/0002-hm_apex.patch index c9465b95..cd462a4d 100644 --- a/Patches/LineageOS-20.0/android_build_soong/0002-hm_apex.patch +++ b/Patches/LineageOS-20.0/android_build_soong/0002-hm_apex.patch @@ -8,10 +8,10 @@ Subject: [PATCH] make hardened malloc available to apexes 1 file changed, 1 insertion(+) diff --git a/apex/apex.go b/apex/apex.go -index 951157f17..2fb50e9a0 100644 +index f12c517e9..d45a6eaca 100644 --- a/apex/apex.go +++ b/apex/apex.go -@@ -2955,6 +2955,7 @@ func makeApexAvailableBaseline() map[string][]string { +@@ -2907,6 +2907,7 @@ func makeApexAvailableBaseline() map[string][]string { "libdebuggerd_handler_fallback", "libdl_static", "libjemalloc5", diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch index 456e11ab..1e47b87b 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch @@ -10,10 +10,10 @@ in both callers of this method (both of which are "End session" buttons), making 1 file changed, 6 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index 787f88be125e..e1e5e7af1951 100644 +index 59f78808723a..06849b8e5aaf 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -@@ -11155,6 +11155,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { +@@ -11160,6 +11160,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Preconditions.checkCallAuthorization(canManageUsers(caller) || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch index e8e9ec68..6712a449 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch @@ -23,10 +23,10 @@ index 0c69067ab131..ef3213b68bfe 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 fb526ec2fcf5..787f88be125e 100644 +index 8decb42a2f68..59f78808723a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -@@ -16083,11 +16083,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { +@@ -16088,11 +16088,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public boolean isLogoutEnabled() { if (!mHasFeature) { diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch index 978f639f..c5b359b5 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-20.0/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 a78c64b6538d..aa0aeabc747e 100644 +index df5113b16f49..eeec22f2ae7f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -4824,12 +4824,7 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -4816,12 +4816,7 @@ public class ActivityManagerService extends IActivityManager.Stub ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch index 568fbe14..8840265c 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch @@ -9,7 +9,7 @@ Ported from 12: b294a2ce1d0d185dbc438ac3c06c90386d5f5949 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 1e13333c1ce0..d6f41f9eda99 100644 +index 014d580e520f..c5694882f5cc 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1409,7 +1409,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -42,7 +42,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 return; } -@@ -1784,7 +1787,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -1785,7 +1788,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt // permission as requiring a review as this is the initial state. final int uid = mPackageManagerInt.getPackageUid(packageName, 0, userId); final int targetSdk = mPackageManagerInt.getUidTargetSdkVersion(uid); @@ -52,7 +52,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 ? FLAG_PERMISSION_REVIEW_REQUIRED | FLAG_PERMISSION_REVOKED_COMPAT : 0; -@@ -1804,7 +1808,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -1805,7 +1809,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt // If this permission was granted by default or role, make sure it is. if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0 @@ -62,7 +62,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 // PermissionPolicyService will handle the app op for runtime permissions later. grantRuntimePermissionInternal(packageName, permName, false, Process.SYSTEM_UID, userId, delayingPermCallback); -@@ -2477,6 +2482,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2478,6 +2483,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } } @@ -73,7 +73,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 /** * Restore the permission state for a package. * -@@ -2601,6 +2610,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2602,6 +2611,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt synchronized (mLock) { for (final int userId : userIds) { final UserPermissionState userState = mState.getOrCreateUserState(userId); @@ -82,7 +82,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 final UidPermissionState uidState = userState.getOrCreateUidState(ps.getAppId()); if (uidState.isMissing()) { -@@ -2617,7 +2628,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2618,7 +2629,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT); } @@ -91,7 +91,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 uidState.updatePermissionFlags(permission, PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, -@@ -2787,7 +2798,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2788,7 +2799,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt boolean restrictionApplied = (origState.getPermissionFlags( bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0; @@ -100,7 +100,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 // If hard restricted we don't allow holding it if (permissionPolicyInitialized && hardRestricted) { if (!restrictionExempt) { -@@ -2840,6 +2851,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2841,6 +2852,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } } } @@ -117,7 +117,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 } else { if (origPermState == null) { // New permission -@@ -2874,7 +2895,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2875,7 +2896,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt if (restrictionApplied) { flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION; // Dropping restriction on a legacy app implies a review @@ -126,7 +126,7 @@ index 1e13333c1ce0..d6f41f9eda99 100644 flags |= FLAG_PERMISSION_REVIEW_REQUIRED; } wasChanged = true; -@@ -3605,7 +3626,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -3606,7 +3627,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt if (shouldGrantPermission) { final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission, myUid, userId); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch index db28474e..6439ab9f 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch @@ -9,10 +9,10 @@ Subject: [PATCH] srt permissions: don't auto-grant denied ones when 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 70fcfb7702b4..beda67a67d20 100644 +index 57cab81a565c..621f5ccad5fc 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -@@ -1809,7 +1809,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -1810,7 +1810,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt // If this permission was granted by default or role, make sure it is. if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0 || (oldFlags & FLAG_PERMISSION_GRANTED_BY_ROLE) != 0 diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch index 5cae69c8..dca4e315 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch @@ -24,7 +24,7 @@ index c8a43db2f9c2..f229b6e25126 100644 field public static final String PHONE = "android.permission-group.PHONE"; field public static final String READ_MEDIA_AURAL = "android.permission-group.READ_MEDIA_AURAL"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 6e48de5ba31f..371a036e284a 100644 +index 1b90803404f7..0372e915b4ab 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1971,13 +1971,21 @@ @@ -51,7 +51,7 @@ index 6e48de5ba31f..371a036e284a 100644 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index d6f41f9eda99..1235eba1d0fb 100644 +index c5694882f5cc..746a5f06768d 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -@@ -2483,7 +2483,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2484,7 +2484,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } public static boolean isSpecialRuntimePermission(final String permission) { diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch index ba1ad591..9eb6928f 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch @@ -33,7 +33,7 @@ index f229b6e25126..773d77422d9f 100644 field public static final String READ_MEDIA_AURAL = "android.permission-group.READ_MEDIA_AURAL"; field public static final String READ_MEDIA_VISUAL = "android.permission-group.READ_MEDIA_VISUAL"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 371a036e284a..eb64b68836f4 100644 +index 0372e915b4ab..3f52b57a0dd3 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1732,6 +1732,18 @@ @@ -56,7 +56,7 @@ index 371a036e284a..eb64b68836f4 100644 diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml -index 42922a094cd7..b153a36f65db 100644 +index cfcc305988bc..2ea89de7d5cb 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -931,6 +931,11 @@ @@ -86,10 +86,10 @@ index 42922a094cd7..b153a36f65db 100644 Read calendar events and details diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -index 1235eba1d0fb..70fcfb7702b4 100644 +index 746a5f06768d..57cab81a565c 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java -@@ -2483,7 +2483,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt +@@ -2484,7 +2484,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } public static boolean isSpecialRuntimePermission(final String permission) { @@ -99,10 +99,10 @@ index 1235eba1d0fb..70fcfb7702b4 100644 /** diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java -index 9bfb40fe11f7..ca3b9e5bda95 100644 +index 7ce7f7ebf6cc..2c1eed855404 100644 --- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java +++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java -@@ -2203,6 +2203,8 @@ public class ParsingPackageUtils { +@@ -2213,6 +2213,8 @@ public class ParsingPackageUtils { pkg.setHasDomainUrls(hasDomainURLs(pkg)); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-5.patch b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-5.patch index 536f274e..4614ae50 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-5.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-5.patch @@ -99,7 +99,7 @@ index 000000000000..efd48cb49aa3 + private SpecialRuntimePermAppUtils() {} +} diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index a638f8cfcb25..dc20b6ccaa3f 100644 +index 461e3ec5ef54..6cde1fee5d65 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -213,6 +213,7 @@ import com.android.server.pm.permission.LegacyPermissionManagerInternal; @@ -110,7 +110,7 @@ index a638f8cfcb25..dc20b6ccaa3f 100644 import com.android.server.pm.pkg.PackageStateInternal; import com.android.server.pm.pkg.PackageUserState; import com.android.server.pm.pkg.PackageUserStateInternal; -@@ -6048,6 +6049,24 @@ public class PackageManagerService implements PackageSender, TestUtilityService +@@ -6058,6 +6059,24 @@ public class PackageManagerService implements PackageSender, TestUtilityService getPerUidReadTimeouts(snapshot) ).doDump(snapshot, fd, pw, args); } diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch index fad5127e..04ca0da2 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch @@ -13,10 +13,10 @@ Change-Id: If891bfbcc144c9336ba013260bad2b7c7a59c054 4 files changed, 47 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index aa40b9202c8a..c43917955d50 100644 +index 6e1ae8ac9fe1..d9e423d3d9ce 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17064,6 +17064,14 @@ public final class Settings { +@@ -17220,6 +17220,14 @@ public final class Settings { public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE = "review_permissions_notification_state"; @@ -32,7 +32,7 @@ index aa40b9202c8a..c43917955d50 100644 * Settings migrated from Wear OS settings provider. * @hide diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml -index f030d80a3533..f14ee3d45d8c 100644 +index e0e13f59b706..9c8c1834f728 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml @@ -50,6 +50,7 @@ @@ -44,10 +44,10 @@ index f030d80a3533..f14ee3d45d8c 100644 diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml -index 6755e6bee975..b89bdf3991d8 100644 +index 6475b6713717..2cc47823a109 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml -@@ -325,6 +325,9 @@ +@@ -329,6 +329,9 @@ @@ -58,10 +58,10 @@ index 6755e6bee975..b89bdf3991d8 100644 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -index 368d6f5df584..a5f89bcb7482 100644 +index 813fa7db6588..e0f8208fb131 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -@@ -194,6 +194,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -196,6 +196,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, private final static String TAG = "KeyguardViewMediator"; @@ -70,7 +70,7 @@ index 368d6f5df584..a5f89bcb7482 100644 private static final String DELAYED_KEYGUARD_ACTION = "com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD"; private static final String DELAYED_LOCK_PROFILE_ACTION = -@@ -332,6 +334,11 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -334,6 +336,11 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, */ private int mDelayedProfileShowingSequence; @@ -82,7 +82,7 @@ index 368d6f5df584..a5f89bcb7482 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 -@@ -1106,6 +1113,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -1194,6 +1201,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, final IntentFilter delayedActionFilter = new IntentFilter(); delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION); delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION); @@ -90,7 +90,7 @@ index 368d6f5df584..a5f89bcb7482 100644 delayedActionFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter, SYSTEMUI_PERMISSION, null /* scheduler */, -@@ -1451,6 +1459,18 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -1540,6 +1548,18 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, } } @@ -109,7 +109,7 @@ index 368d6f5df584..a5f89bcb7482 100644 private void doKeyguardForChildProfilesLocked() { UserManager um = UserManager.get(mContext); for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) { -@@ -1468,6 +1488,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -1557,6 +1577,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, mDelayedProfileShowingSequence++; } @@ -120,7 +120,7 @@ index 368d6f5df584..a5f89bcb7482 100644 /** * It will let us know when the device is waking up. */ -@@ -1824,6 +1848,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -1917,6 +1941,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(options); @@ -131,7 +131,7 @@ index 368d6f5df584..a5f89bcb7482 100644 } private void lockProfile(int userId) { -@@ -2008,6 +2036,12 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -2101,6 +2129,12 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, } } } @@ -144,11 +144,11 @@ index 368d6f5df584..a5f89bcb7482 100644 } } }; -@@ -2578,6 +2612,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, +@@ -2688,6 +2722,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, mHideAnimationRun = false; adjustStatusBarLocked(); sendUserPresentBroadcast(); + cancelDoRebootForOwnerAfterTimeoutIfEnabled(); } - private Configuration.Builder createInteractionJankMonitorConf(String tag) { + private Configuration.Builder createInteractionJankMonitorConf(int cuj) { diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch index 997376bf..f176d90f 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch @@ -12,10 +12,10 @@ Co-authored-by: Pratyush create mode 100644 services/core/java/com/android/server/ext/BluetoothAutoOff.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 253fec41e120..a60ec93697a6 100644 +index b0def536be93..4516c28f9c6a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17078,6 +17078,12 @@ public final class Settings { +@@ -17234,6 +17234,12 @@ public final class Settings { */ public static final String WIFI_OFF_TIMEOUT = "wifi_off_timeout"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0015-System_Server_Extensions.patch b/Patches/LineageOS-20.0/android_frameworks_base/0015-System_Server_Extensions.patch index f41630ec..1eba12ed 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0015-System_Server_Extensions.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0015-System_Server_Extensions.patch @@ -217,10 +217,10 @@ index 000000000000..83d895650473 + } +} diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java -index f1963c99f55e..966c166addef 100644 +index ba63d9b3b398..ff3b64bdac7d 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java -@@ -2230,7 +2230,7 @@ public final class SystemServer implements Dumpable { +@@ -2222,7 +2222,7 @@ public final class SystemServer implements Dumpable { Slog.e(TAG, "Failure starting HardwarePropertiesManagerService", e); } t.traceEnd(); @@ -229,7 +229,7 @@ index f1963c99f55e..966c166addef 100644 if (!isWatch) { t.traceBegin("StartTwilightService"); mSystemServiceManager.startService(TwilightService.class); -@@ -3069,6 +3069,8 @@ public final class SystemServer implements Dumpable { +@@ -3061,6 +3061,8 @@ public final class SystemServer implements Dumpable { reportWtf("Triggering OdsignStatsLogger", e); } t.traceEnd(); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch index f57a91b9..955e5492 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch @@ -12,10 +12,10 @@ Co-authored-by: Pratyush create mode 100644 services/core/java/com/android/server/ext/WifiAutoOff.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index c43917955d50..253fec41e120 100644 +index d9e423d3d9ce..b0def536be93 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17072,6 +17072,12 @@ public final class Settings { +@@ -17228,6 +17228,12 @@ public final class Settings { */ public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch b/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch index 798f70b7..3c228948 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch @@ -12,10 +12,10 @@ 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 d655721615b6..cad56011d94b 100644 +index 659d0f37bf05..3c785bfbe241 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3737,7 +3737,7 @@ +@@ -3798,7 +3798,7 @@ diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0023-Skip_Screen_Animation.patch b/Patches/LineageOS-20.0/android_frameworks_base/0023-Skip_Screen_Animation.patch index 45872724..86c4f9aa 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0023-Skip_Screen_Animation.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0023-Skip_Screen_Animation.patch @@ -12,10 +12,10 @@ sensors. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java -index 269944d78c5f..e95270b6e880 100644 +index f64c2f322b81..dca07386a440 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java -@@ -4042,7 +4042,7 @@ public class CentralSurfacesImpl extends CoreStartable implements +@@ -4049,7 +4049,7 @@ public class CentralSurfacesImpl extends CoreStartable implements boolean launchingAffordanceWithPreview = mNotificationPanelViewController.isLaunchingAffordanceWithPreview(); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0028-Remove_Legacy_Package_Query.patch b/Patches/LineageOS-20.0/android_frameworks_base/0028-Remove_Legacy_Package_Query.patch index 57c90468..e270c2f9 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0028-Remove_Legacy_Package_Query.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0028-Remove_Legacy_Package_Query.patch @@ -22,10 +22,10 @@ https://github.com/GrapheneOS/os-issue-tracker/issues/1634 for more details. 1 file changed, 12 deletions(-) diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java -index 259ca655d2b9..1845d7b1cbcf 100644 +index 46b7460dff1b..58448bfefdaf 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java -@@ -2845,24 +2845,12 @@ public class ComputerEngine implements Computer { +@@ -2857,24 +2857,12 @@ public class ComputerEngine implements Computer { * Update given flags when being used to request {@link PackageInfo}. */ public final long updateFlagsForPackage(long flags, int userId) { diff --git a/Patches/LineageOS-20.0/android_frameworks_libs_systemui/0001-Icon_Cache.patch b/Patches/LineageOS-20.0/android_frameworks_libs_systemui/0001-Icon_Cache.patch index 3982d6c5..f33187ef 100644 --- a/Patches/LineageOS-20.0/android_frameworks_libs_systemui/0001-Icon_Cache.patch +++ b/Patches/LineageOS-20.0/android_frameworks_libs_systemui/0001-Icon_Cache.patch @@ -8,10 +8,10 @@ Subject: [PATCH] invalidate icon cache between OS releases 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java -index 057bdc2..23288f0 100644 +index 963e807..7d396c0 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java +++ b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java -@@ -237,7 +237,7 @@ public abstract class BaseIconCache { +@@ -267,7 +267,7 @@ public abstract class BaseIconCache { */ private void updateSystemState() { mLocaleList = mContext.getResources().getConfiguration().getLocales(); @@ -19,4 +19,4 @@ index 057bdc2..23288f0 100644 + mSystemState = mLocaleList.toLanguageTags() + "," + Build.VERSION.INCREMENTAL; } - protected String getIconSystemState(String packageName) { + @NonNull diff --git a/Patches/LineageOS-20.0/android_frameworks_native/0001-Sensors_Permission-a1.patch b/Patches/LineageOS-20.0/android_frameworks_native/0001-Sensors_Permission-a1.patch index e3509c5e..d3bec6fd 100644 --- a/Patches/LineageOS-20.0/android_frameworks_native/0001-Sensors_Permission-a1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_native/0001-Sensors_Permission-a1.patch @@ -9,10 +9,10 @@ Subject: [PATCH] protect step sensors with OTHER_SENSORS permission for 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp -index 948692bd47..6caee5b220 100644 +index e0a4f034cb..1a9de29138 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp -@@ -2015,17 +2015,9 @@ bool SensorService::canAccessSensor(const Sensor& sensor, const char* operation, +@@ -2010,17 +2010,9 @@ bool SensorService::canAccessSensor(const Sensor& sensor, const char* operation, } const int32_t opCode = sensor.getRequiredAppOp(); @@ -31,7 +31,7 @@ index 948692bd47..6caee5b220 100644 // Ensure that the AppOp is allowed, or that there is no necessary app op for the sensor if (opCode >= 0) { const int32_t appOpMode = sAppOpsManager.checkOp(opCode, -@@ -2034,6 +2026,20 @@ bool SensorService::canAccessSensor(const Sensor& sensor, const char* operation, +@@ -2029,6 +2021,20 @@ bool SensorService::canAccessSensor(const Sensor& sensor, const char* operation, } else { canAccess = true; } diff --git a/Patches/LineageOS-20.0/android_frameworks_opt_net_wifi/0001-Random_MAC.patch b/Patches/LineageOS-20.0/android_frameworks_opt_net_wifi/0001-Random_MAC.patch index 919dbdd6..642f628d 100644 --- a/Patches/LineageOS-20.0/android_frameworks_opt_net_wifi/0001-Random_MAC.patch +++ b/Patches/LineageOS-20.0/android_frameworks_opt_net_wifi/0001-Random_MAC.patch @@ -14,10 +14,10 @@ based on https://github.com/GrapheneOS/platform_frameworks_opt_net_wifi/commit/a 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java -index 249544b7d..49ae22dae 100644 +index bdb051094..7eaade10c 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java -@@ -267,7 +267,7 @@ public class StandardWifiEntry extends WifiEntry { +@@ -268,7 +268,7 @@ public class StandardWifiEntry extends WifiEntry { return wifiInfoMac; } } @@ -26,7 +26,7 @@ index 249544b7d..49ae22dae 100644 final String[] factoryMacs = mWifiManager.getFactoryMacAddresses(); if (factoryMacs.length > 0) { return factoryMacs[0]; -@@ -550,12 +550,18 @@ public class StandardWifiEntry extends WifiEntry { +@@ -552,12 +552,18 @@ public class StandardWifiEntry extends WifiEntry { @Override @Privacy public synchronized int getPrivacy() { @@ -50,7 +50,7 @@ index 249544b7d..49ae22dae 100644 } } -@@ -565,11 +571,21 @@ public class StandardWifiEntry extends WifiEntry { +@@ -567,11 +573,21 @@ public class StandardWifiEntry extends WifiEntry { return; } diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch index b5c8ba01..96d6277c 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0004-Private_DNS.patch @@ -81,10 +81,10 @@ index 12e29e693b..b6745806b5 100644 android:id="@+id/private_dns_mode_opportunistic" layout="@layout/preference_widget_dialog_radiobutton"/> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml -index fb73b642c2..55442553f6 100644 +index 9f4cbeebc3..ee474b56b6 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml -@@ -156,6 +156,21 @@ +@@ -153,6 +153,21 @@ Wi\u2011Fi data Enable usage of Wi\u2011Fi data diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0005-Automatic_Reboot.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0005-Automatic_Reboot.patch index 08df2b9e..04d914fb 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0005-Automatic_Reboot.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0005-Automatic_Reboot.patch @@ -55,10 +55,10 @@ index 0632f72eb0..35e3247663 100644 Small Default diff --git a/res/values/strings.xml b/res/values/strings.xml -index 04b2de208b..5d4879d123 100644 +index bbdefd1427..c1aaf40f96 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -701,6 +701,9 @@ +@@ -706,6 +706,9 @@ Disabled by admin @@ -183,7 +183,7 @@ index 0000000000..c7a75219a5 + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 6aadee6aad..abc3dce662 100644 +index b30b54d4d4..46a4ff90bf 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -105,6 +105,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch index 61d84af5..5d632cec 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch @@ -67,7 +67,7 @@ index 35e3247663..5adc98d256 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 5d4879d123..6163398746 100644 +index c1aaf40f96..7ea1708b72 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -27,6 +27,25 @@ diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0007-WiFi_Timeout.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0007-WiFi_Timeout.patch index ad5f0a0a..b67a9c9a 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0007-WiFi_Timeout.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0007-WiFi_Timeout.patch @@ -67,7 +67,7 @@ index 5adc98d256..9cac9fbee2 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 6163398746..124473edde 100644 +index 7ea1708b72..59afb3e23a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -46,6 +46,25 @@ diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0008-ptrace_scope.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0008-ptrace_scope.patch index 2fc4e6eb..85670b34 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0008-ptrace_scope.patch +++ b/Patches/LineageOS-20.0/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 124473edde..446fa056cd 100644 +index 59afb3e23a..22ac15ca31 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -742,6 +742,9 @@ +@@ -747,6 +747,9 @@ Auto reboot Automatically reboot the device, if the phone hasn\'t been unlocked within the selected number of hours. @@ -155,7 +155,7 @@ index 0000000000..9271e6e21c + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index abc3dce662..706a9b572c 100644 +index 46a4ff90bf..ecf8f02e9d 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -106,6 +106,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0009-Install_Restrictions.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0009-Install_Restrictions.patch index 65d0149f..3ae3e775 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0009-Install_Restrictions.patch +++ b/Patches/LineageOS-20.0/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 34cc6ff884..c1f4b6fcde 100644 +index 5318c00777..27364b13dd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7799,6 +7799,8 @@ +@@ -7979,6 +7979,8 @@ Turn on phone calls Turn on phone calls & SMS @@ -38,7 +38,7 @@ index 2301bac1d4..d2766360a0 100644 android:key="app_copying" android:icon="@drawable/ic_apps" diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java -index 99760401d2..5f9387f1f6 100644 +index 3f51b83b9d..b6f87dcc11 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -64,6 +64,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment @@ -49,7 +49,7 @@ index 99760401d2..5f9387f1f6 100644 /** Integer extra containing the userId to manage */ static final String EXTRA_USER_ID = "user_id"; -@@ -92,6 +93,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment +@@ -93,6 +94,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment Preference mAppCopyingPref; @VisibleForTesting Preference mRemoveUserPref; @@ -57,7 +57,7 @@ index 99760401d2..5f9387f1f6 100644 @VisibleForTesting /** The user being studied (not the user doing the studying). */ -@@ -159,12 +161,37 @@ public class UserDetailsSettings extends SettingsPreferenceFragment +@@ -165,12 +167,37 @@ public class UserDetailsSettings extends SettingsPreferenceFragment @Override public boolean onPreferenceChange(Preference preference, Object newValue) { @@ -100,7 +100,7 @@ index 99760401d2..5f9387f1f6 100644 return true; } -@@ -258,6 +285,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment +@@ -273,6 +300,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment mRemoveUserPref = findPreference(KEY_REMOVE_USER); mAppAndContentAccessPref = findPreference(KEY_APP_AND_CONTENT_ACCESS); mAppCopyingPref = findPreference(KEY_APP_COPYING); @@ -108,7 +108,7 @@ index 99760401d2..5f9387f1f6 100644 mSwitchUserPref.setTitle( context.getString(com.android.settingslib.R.string.user_switch_to_user, -@@ -276,6 +304,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment +@@ -291,6 +319,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment removePreference(KEY_REMOVE_USER); removePreference(KEY_APP_AND_CONTENT_ACCESS); removePreference(KEY_APP_COPYING); @@ -116,7 +116,7 @@ index 99760401d2..5f9387f1f6 100644 } else { if (!Utils.isVoiceCapable(context)) { // no telephony removePreference(KEY_ENABLE_TELEPHONY); -@@ -309,11 +338,14 @@ public class UserDetailsSettings extends SettingsPreferenceFragment +@@ -324,11 +353,14 @@ public class UserDetailsSettings extends SettingsPreferenceFragment if (!SHOW_APP_COPYING_PREF) { removePreference(KEY_APP_COPYING); } @@ -131,7 +131,7 @@ index 99760401d2..5f9387f1f6 100644 } if (RestrictedLockUtilsInternal.hasBaseUserRestriction(context, UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) { -@@ -324,6 +356,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment +@@ -339,6 +371,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment mPhonePref.setOnPreferenceChangeListener(this); mAppAndContentAccessPref.setOnPreferenceClickListener(this); mAppCopyingPref.setOnPreferenceClickListener(this); diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0010-exec_spawning_toggle.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0010-exec_spawning_toggle.patch index ae645fbc..a2b4cc4f 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0010-exec_spawning_toggle.patch +++ b/Patches/LineageOS-20.0/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 446fa056cd..34cc6ff884 100644 +index 22ac15ca31..5318c00777 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -742,6 +742,9 @@ +@@ -747,6 +747,9 @@ Auto reboot Automatically reboot the device, if the phone hasn\'t been unlocked within the selected number of hours. @@ -155,7 +155,7 @@ index 0000000000..98cc3c29e1 + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 706a9b572c..315dcf818a 100644 +index ecf8f02e9d..e48164ae62 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -106,6 +106,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0011-Random_MAC.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0011-Random_MAC.patch index 22e6a192..ad5ebd0a 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0011-Random_MAC.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0011-Random_MAC.patch @@ -64,10 +64,10 @@ index eb9add14f6..2079ef1675 100644 Enable native code debugging Generate useful logs / bug reports from crashes and permit debugging native code. @@ -159,7 +159,7 @@ index 0000000000..d8af6d2649 + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java -index 315dcf818a..f353ea644b 100644 +index e48164ae62..643de279a4 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -108,6 +108,7 @@ public class SecuritySettings extends DashboardFragment { diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch index 68665c9c..7139e69a 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch @@ -46,10 +46,10 @@ index cfc7671652..7fac175770 100644 These are shown in a list dialog. --> diff --git a/res/values/strings.xml b/res/values/strings.xml -index d9f4a37f2d..bba0900122 100644 +index fa753aaa8e..858d5a6588 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -14254,4 +14254,7 @@ +@@ -14456,4 +14456,7 @@ QR code isn\u0027t a valid format diff --git a/Patches/LineageOS-20.0/android_system_core/0001-Harden.patch b/Patches/LineageOS-20.0/android_system_core/0001-Harden.patch index 7debbf97..7e811621 100644 --- a/Patches/LineageOS-20.0/android_system_core/0001-Harden.patch +++ b/Patches/LineageOS-20.0/android_system_core/0001-Harden.patch @@ -37,7 +37,7 @@ index d050ed783..e828916d6 100644 CHECKCALL(mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11))); diff --git a/rootdir/init.rc b/rootdir/init.rc -index 870a97b55..cf3b6de8c 100644 +index c56f86089..3ab24300f 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -330,6 +330,17 @@ on init diff --git a/Patches/LineageOS-20.0/android_system_core/0002-ptrace_scope.patch b/Patches/LineageOS-20.0/android_system_core/0002-ptrace_scope.patch index 8257ff3f..a9e2c2df 100644 --- a/Patches/LineageOS-20.0/android_system_core/0002-ptrace_scope.patch +++ b/Patches/LineageOS-20.0/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 cf3b6de8c..20c734f9f 100644 +index 3ab24300f..be0604271 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc -@@ -1219,6 +1219,12 @@ on property:perf.drop_caches=3 +@@ -1216,6 +1216,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-20.0/android_system_core/0003-HM-Increase_vm_mmc.patch b/Patches/LineageOS-20.0/android_system_core/0003-HM-Increase_vm_mmc.patch index 4388fc11..fb3b7254 100644 --- a/Patches/LineageOS-20.0/android_system_core/0003-HM-Increase_vm_mmc.patch +++ b/Patches/LineageOS-20.0/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 20c734f9f..1f428c6dc 100644 +index be0604271..fb960eed7 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc -@@ -1104,6 +1104,8 @@ on boot +@@ -1101,6 +1101,8 @@ on boot symlink /sys/class/block/${dev.mnt.dev.data} /dev/sys/block/by-name/userdata symlink /sys/class/block/${dev.mnt.rootdisk.data} /dev/sys/block/by-name/rootdisk diff --git a/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch b/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch index 623b728b..cce94280 100644 --- a/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch +++ b/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch @@ -77,7 +77,7 @@ index f235b35b7..895b8f1df 100644 persist.logd. u:object_r:logd_prop:s0 ro.logd. u:object_r:logd_prop:s0 diff --git a/prebuilts/api/33.0/private/property_contexts b/prebuilts/api/33.0/private/property_contexts -index 1b2360d18..061f7fb59 100644 +index 4eda4a169..111f7890a 100644 --- a/prebuilts/api/33.0/private/property_contexts +++ b/prebuilts/api/33.0/private/property_contexts @@ -58,6 +58,7 @@ persist.nfc. u:object_r:nfc_prop:s0 @@ -89,7 +89,7 @@ index 1b2360d18..061f7fb59 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 1b2360d18..061f7fb59 100644 +index 4eda4a169..111f7890a 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -58,6 +58,7 @@ persist.nfc. u:object_r:nfc_prop:s0 diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh index c1b07f82..2071a6a0 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh @@ -1,7 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/msm-4.14" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0278-0279.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0283-0284.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0289-0290.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 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0057.patch @@ -60,36 +59,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch 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.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/^5.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0812/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-1184/4.14/0004.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-1419/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1729/4.14/0002.patch -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-1966/4.14/0002.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-2153/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2588/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3239/4.14/0006.patch @@ -110,19 +86,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/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-32981/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33740/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33741/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33742/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.14/0002.patch @@ -134,5 +100,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.patch -editKernelLocalversion "-dos.p134" +editKernelLocalversion "-dos.p100" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh index 89092927..729be0c5 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/redbull" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0247-0248.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0253-0254.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 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.19/0087.patch @@ -52,44 +52,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16120/^5.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/^5.0/0001.patch 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-4159/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0812/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/4.19/0015.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.19/0006.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-1419/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1729/4.19/0003.patch -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-1966/4.19/0003.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-2153/4.19/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/4.19/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2503/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2586/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2588/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/4.19/0003.patch @@ -111,19 +86,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-32981/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33740/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33741/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33742/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0004.patch @@ -136,5 +103,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.patch -editKernelLocalversion "-dos.p136" +editKernelLocalversion "-dos.p103" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index e95c2341..4428ce70 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -49,18 +49,18 @@ buildAll() { cd "$DOS_BUILD_BASE"; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; #SD835 - buildDevice cheeseburger verity; - buildDevice dumpling verity; buildDevice taimen avb; buildDevice walleye avb; + buildDevice cheeseburger verity; + buildDevice dumpling verity; #SD845 + buildDevice fajita avb; + buildDevice enchilada avb; buildDevice aura avb; buildDevice beryllium avb; buildDevice pro1 avb; buildDevice crosshatch avb; buildDevice blueline avb; - buildDevice enchilada avb; - buildDevice fajita avb; #SD750 buildDevice FP4 avb; #SD855