Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

A13 QPR2 Churn

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-03-19 20:23:48 -04:00
parent ec38522af9
commit 9475615e77
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
42 changed files with 152 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch
View File

@ -10,10 +10,10 @@ in both callers of this method (both of which are "End session" buttons), making
1 file changed, 6 insertions(+) 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 diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 59f78808723a..06849b8e5aaf 100644 index ba084057c721..b870c54b2768 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -11160,6 +11160,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @@ -11162,6 +11162,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
Preconditions.checkCallAuthorization(canManageUsers(caller) Preconditions.checkCallAuthorization(canManageUsers(caller)
|| hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS));

4
Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch
View File

@ -23,10 +23,10 @@ index 0c69067ab131..ef3213b68bfe 100644
// one notification after enabling + one more after reboots // one notification after enabling + one more after reboots
static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2; 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 diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 8decb42a2f68..59f78808723a 100644 index 515d6dc9cab1..ba084057c721 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -16088,11 +16088,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @@ -16090,11 +16090,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
@Override @Override
public boolean isLogoutEnabled() { public boolean isLogoutEnabled() {
if (!mHasFeature) { if (!mHasFeature) {

4
Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch
View File

@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
1 file changed, 1 insertion(+), 6 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 968ff933ed74..fc01e0757d43 100644 index 5d4dc39341a1..950a13f1e025 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java --- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4819,12 +4819,7 @@ public class ActivityManagerService extends IActivityManager.Stub @@ -4822,12 +4822,7 @@ public class ActivityManagerService extends IActivityManager.Stub
ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr); ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr);

4
Patches/LineageOS-20.0/android_frameworks_base/0008-Browser_No_Location.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] stop auto-granting location to system browsers
1 file changed, 13 deletions(-) 1 file changed, 13 deletions(-)
diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index 0ae92b4ee846..091b067682e1 100644 index 32ee21cf1658..0443d19ba1d4 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -763,19 +763,6 @@ final class DefaultPermissionGrantPolicy { @@ -767,19 +767,6 @@ final class DefaultPermissionGrantPolicy {
Intent.CATEGORY_APP_EMAIL, userId), Intent.CATEGORY_APP_EMAIL, userId),
userId, CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS); userId, CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS);

10
Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch
View File

@ -12,7 +12,7 @@ Ported from 12: a980a4c3d6b6906eb0ee5fb07ca4cf0bae052d00
4 files changed, 16 insertions(+), 2 deletions(-) 4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/core/api/current.txt b/core/api/current.txt diff --git a/core/api/current.txt b/core/api/current.txt
index c8a43db2f9c2..f229b6e25126 100644 index 487e57d114c9..306a105bd169 100644
--- a/core/api/current.txt --- a/core/api/current.txt
+++ b/core/api/current.txt +++ b/core/api/current.txt
@@ -225,6 +225,7 @@ package android { @@ -225,6 +225,7 @@ package android {
@ -24,10 +24,10 @@ index c8a43db2f9c2..f229b6e25126 100644
field public static final String PHONE = "android.permission-group.PHONE"; field public static final String PHONE = "android.permission-group.PHONE";
field public static final String READ_MEDIA_AURAL = "android.permission-group.READ_MEDIA_AURAL"; 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 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1b90803404f7..0372e915b4ab 100644 index bbe31240f5f3..4bac265e5834 100644
--- a/core/res/AndroidManifest.xml --- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml
@@ -1971,13 +1971,21 @@ @@ -2001,13 +2001,21 @@
<!-- ======================================= --> <!-- ======================================= -->
<eat-comment /> <eat-comment />
@ -51,10 +51,10 @@ index 1b90803404f7..0372e915b4ab 100644
<!-- Allows applications to access information about networks. <!-- Allows applications to access information about networks.
<p>Protection level: normal <p>Protection level: normal
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 5763345aba4d..cfcc305988bc 100644 index 9410e0682106..2eb74e9f98a8 100644
--- a/core/res/res/values/strings.xml --- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml
@@ -931,6 +931,11 @@ @@ -934,6 +934,11 @@
<!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]--> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]-->
<string name="permgroupdesc_notifications">show notifications</string> <string name="permgroupdesc_notifications">show notifications</string>

12
Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch
View File

@ -13,7 +13,7 @@ Ported from 12: 9d5a62ed573bc3c7be8b19445b372fed13533d0e
5 files changed, 29 insertions(+), 1 deletion(-) 5 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/core/api/current.txt b/core/api/current.txt diff --git a/core/api/current.txt b/core/api/current.txt
index f229b6e25126..773d77422d9f 100644 index 306a105bd169..7297e731af40 100644
--- a/core/api/current.txt --- a/core/api/current.txt
+++ b/core/api/current.txt +++ b/core/api/current.txt
@@ -122,6 +122,7 @@ package android { @@ -122,6 +122,7 @@ package android {
@ -33,10 +33,10 @@ 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_AURAL = "android.permission-group.READ_MEDIA_AURAL";
field public static final String READ_MEDIA_VISUAL = "android.permission-group.READ_MEDIA_VISUAL"; 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 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0372e915b4ab..3f52b57a0dd3 100644 index 4bac265e5834..ab3a610cec14 100644
--- a/core/res/AndroidManifest.xml --- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml
@@ -1732,6 +1732,18 @@ @@ -1762,6 +1762,18 @@
android:protectionLevel="dangerous|instant" /> android:protectionLevel="dangerous|instant" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@ -56,10 +56,10 @@ index 0372e915b4ab..3f52b57a0dd3 100644
<!-- REMOVED PERMISSIONS --> <!-- REMOVED PERMISSIONS -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index cfcc305988bc..2ea89de7d5cb 100644 index 2eb74e9f98a8..0e5b6a9d2596 100644
--- a/core/res/res/values/strings.xml --- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml
@@ -931,6 +931,11 @@ @@ -934,6 +934,11 @@
<!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]--> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]-->
<string name="permgroupdesc_notifications">show notifications</string> <string name="permgroupdesc_notifications">show notifications</string>
@ -71,7 +71,7 @@ index cfcc305988bc..2ea89de7d5cb 100644
<!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permgrouplab_network">Network</string> <string name="permgrouplab_network">Network</string>
<!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
@@ -1261,6 +1266,13 @@ @@ -1264,6 +1269,13 @@
<!-- Description of the background body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors in the background. [CHAR LIMIT=NONE] --> <!-- Description of the background body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors in the background. [CHAR LIMIT=NONE] -->
<string name="permdesc_bodySensors_background" product="default">Allows the app to access body sensor data, such as heart rate, temperature, and blood oxygen percentage, while the app is in the background.</string> <string name="permdesc_bodySensors_background" product="default">Allows the app to access body sensor data, such as heart rate, temperature, and blood oxygen percentage, while the app is in the background.</string>

4
Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-5.patch
View File

@ -99,7 +99,7 @@ index 000000000000..efd48cb49aa3
+ private SpecialRuntimePermAppUtils() {} + private SpecialRuntimePermAppUtils() {}
+} +}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 461e3ec5ef54..6cde1fee5d65 100644 index 8bf821dfe428..d6c501c0e8ce 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/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; @@ -213,6 +213,7 @@ import com.android.server.pm.permission.LegacyPermissionManagerInternal;
@ -110,7 +110,7 @@ index 461e3ec5ef54..6cde1fee5d65 100644
import com.android.server.pm.pkg.PackageStateInternal; import com.android.server.pm.pkg.PackageStateInternal;
import com.android.server.pm.pkg.PackageUserState; import com.android.server.pm.pkg.PackageUserState;
import com.android.server.pm.pkg.PackageUserStateInternal; import com.android.server.pm.pkg.PackageUserStateInternal;
@@ -6058,6 +6059,24 @@ public class PackageManagerService implements PackageSender, TestUtilityService @@ -6085,6 +6086,24 @@ public class PackageManagerService implements PackageSender, TestUtilityService
getPerUidReadTimeouts(snapshot) getPerUidReadTimeouts(snapshot)
).doDump(snapshot, fd, pw, args); ).doDump(snapshot, fd, pw, args);
} }

32
Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch
View File

@ -13,10 +13,10 @@ Change-Id: If891bfbcc144c9336ba013260bad2b7c7a59c054
4 files changed, 47 insertions(+) 4 files changed, 47 insertions(+)
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 801c7d28fec2..c7abb8901cad 100644 index ab49bd6828a9..ee42bf704cfd 100644
--- a/core/java/android/provider/Settings.java --- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java
@@ -17237,6 +17237,14 @@ public final class Settings { @@ -17271,6 +17271,14 @@ public final class Settings {
public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE = public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE =
"review_permissions_notification_state"; "review_permissions_notification_state";
@ -44,10 +44,10 @@ index e0e13f59b706..9c8c1834f728 100644
<permission name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE"/> <permission name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE"/>
<permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/> <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 6475b6713717..2cc47823a109 100644 index 44c06be67e10..1d35548c0a25 100644
--- a/packages/SystemUI/AndroidManifest.xml --- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml
@@ -329,6 +329,9 @@ @@ -336,6 +336,9 @@
<uses-permission android:name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS" /> <uses-permission android:name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS" />
@ -58,10 +58,10 @@ index 6475b6713717..2cc47823a109 100644
<protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />
<protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" /> <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" />
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 813fa7db6588..e0f8208fb131 100644 index 3088e64a68ce..58d8957fdb31 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -196,6 +196,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -201,6 +201,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
private final static String TAG = "KeyguardViewMediator"; private final static String TAG = "KeyguardViewMediator";
@ -70,7 +70,7 @@ index 813fa7db6588..e0f8208fb131 100644
private static final String DELAYED_KEYGUARD_ACTION = private static final String DELAYED_KEYGUARD_ACTION =
"com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD"; "com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD";
private static final String DELAYED_LOCK_PROFILE_ACTION = private static final String DELAYED_LOCK_PROFILE_ACTION =
@@ -334,6 +336,11 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -348,6 +350,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
*/ */
private int mDelayedProfileShowingSequence; private int mDelayedProfileShowingSequence;
@ -79,10 +79,10 @@ index 813fa7db6588..e0f8208fb131 100644
+ */ + */
+ private int mDelayedRebootSequence; + private int mDelayedRebootSequence;
+ +
/** private final DismissCallbackRegistry mDismissCallbackRegistry;
* 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 // the properties of the keyguard
@@ -1194,6 +1201,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -1255,6 +1262,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
final IntentFilter delayedActionFilter = new IntentFilter(); final IntentFilter delayedActionFilter = new IntentFilter();
delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION); delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION);
delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION); delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION);
@ -90,7 +90,7 @@ index 813fa7db6588..e0f8208fb131 100644
delayedActionFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); delayedActionFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter, mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter,
SYSTEMUI_PERMISSION, null /* scheduler */, SYSTEMUI_PERMISSION, null /* scheduler */,
@@ -1540,6 +1548,18 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -1590,6 +1598,18 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
} }
@ -109,7 +109,7 @@ index 813fa7db6588..e0f8208fb131 100644
private void doKeyguardForChildProfilesLocked() { private void doKeyguardForChildProfilesLocked() {
UserManager um = UserManager.get(mContext); UserManager um = UserManager.get(mContext);
for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) { for (int profileId : um.getEnabledProfileIds(UserHandle.myUserId())) {
@@ -1557,6 +1577,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -1607,6 +1627,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
mDelayedProfileShowingSequence++; mDelayedProfileShowingSequence++;
} }
@ -120,7 +120,7 @@ index 813fa7db6588..e0f8208fb131 100644
/** /**
* It will let us know when the device is waking up. * It will let us know when the device is waking up.
*/ */
@@ -1917,6 +1941,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -1947,6 +1971,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen");
showLocked(options); showLocked(options);
@ -131,7 +131,7 @@ index 813fa7db6588..e0f8208fb131 100644
} }
private void lockProfile(int userId) { private void lockProfile(int userId) {
@@ -2101,6 +2129,12 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -2131,6 +2159,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
} }
} }
@ -144,7 +144,7 @@ index 813fa7db6588..e0f8208fb131 100644
} }
} }
}; };
@@ -2688,6 +2722,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @@ -2706,6 +2740,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
mHideAnimationRun = false; mHideAnimationRun = false;
adjustStatusBarLocked(); adjustStatusBarLocked();
sendUserPresentBroadcast(); sendUserPresentBroadcast();

4
Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch
View File

@ -12,10 +12,10 @@ Co-authored-by: Pratyush <codelab@pratyush.dev>
create mode 100644 services/core/java/com/android/server/ext/BluetoothAutoOff.java 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 diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 823177ed7b57..e12274516a55 100644 index 2ff66f32ed08..206e9454b3a0 100644
--- a/core/java/android/provider/Settings.java --- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java
@@ -17251,6 +17251,12 @@ public final class Settings { @@ -17285,6 +17285,12 @@ public final class Settings {
*/ */
public static final String WIFI_OFF_TIMEOUT = "wifi_off_timeout"; public static final String WIFI_OFF_TIMEOUT = "wifi_off_timeout";

6
Patches/LineageOS-20.0/android_frameworks_base/0015-System_Server_Extensions.patch
View File

@ -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 diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index ba63d9b3b398..ff3b64bdac7d 100644 index aa6918451fc1..960d7ae2eba9 100644
--- a/services/java/com/android/server/SystemServer.java --- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java
@@ -2222,7 +2222,7 @@ public final class SystemServer implements Dumpable { @@ -2223,7 +2223,7 @@ public final class SystemServer implements Dumpable {
Slog.e(TAG, "Failure starting HardwarePropertiesManagerService", e); Slog.e(TAG, "Failure starting HardwarePropertiesManagerService", e);
} }
t.traceEnd(); t.traceEnd();
@ -229,7 +229,7 @@ index ba63d9b3b398..ff3b64bdac7d 100644
if (!isWatch) { if (!isWatch) {
t.traceBegin("StartTwilightService"); t.traceBegin("StartTwilightService");
mSystemServiceManager.startService(TwilightService.class); mSystemServiceManager.startService(TwilightService.class);
@@ -3061,6 +3061,8 @@ public final class SystemServer implements Dumpable { @@ -3062,6 +3062,8 @@ public final class SystemServer implements Dumpable {
reportWtf("Triggering OdsignStatsLogger", e); reportWtf("Triggering OdsignStatsLogger", e);
} }
t.traceEnd(); t.traceEnd();

4
Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch
View File

@ -12,10 +12,10 @@ Co-authored-by: Pratyush <codelab@pratyush.dev>
create mode 100644 services/core/java/com/android/server/ext/WifiAutoOff.java 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 diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c7abb8901cad..823177ed7b57 100644 index ee42bf704cfd..2ff66f32ed08 100644
--- a/core/java/android/provider/Settings.java --- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java
@@ -17245,6 +17245,12 @@ public final class Settings { @@ -17279,6 +17279,12 @@ public final class Settings {
*/ */
public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout"; public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout";

10
Patches/LineageOS-20.0/android_frameworks_base/0018-Exec_Based_Spawning-12.patch
View File

@ -91,10 +91,10 @@ index 4573cb2c0b59..9cc90f3ac142 100644
// Should not get here. // Should not get here.
throw new IllegalStateException("ExecInit.execApplication unexpectedly returned"); throw new IllegalStateException("ExecInit.execApplication unexpectedly returned");
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 21bbac0b0a7d..a7e4ea1624e6 100644 index c8b85c314aca..9800b24cdff5 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp --- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -1540,6 +1540,80 @@ static void BindMountStorageDirs(JNIEnv* env, jobjectArray pkg_data_info_list, @@ -1721,6 +1721,80 @@ static void BindMountStorageDirs(JNIEnv* env, jobjectArray pkg_data_info_list,
} }
} }
@ -175,7 +175,7 @@ index 21bbac0b0a7d..a7e4ea1624e6 100644
// Utility routine to specialize a zygote child process. // Utility routine to specialize a zygote child process.
static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, jint runtime_flags, static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, jint runtime_flags,
jobjectArray rlimits, jlong permitted_capabilities, jobjectArray rlimits, jlong permitted_capabilities,
@@ -1673,74 +1747,9 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, @@ -1860,74 +1934,9 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
} }
} }
@ -252,7 +252,7 @@ index 21bbac0b0a7d..a7e4ea1624e6 100644
SetCapabilities(permitted_capabilities, effective_capabilities, permitted_capabilities, SetCapabilities(permitted_capabilities, effective_capabilities, permitted_capabilities,
fail_fn); fail_fn);
@@ -2634,6 +2643,10 @@ static void com_android_internal_os_Zygote_nativeAllowFilesOpenedByPreload(JNIEn @@ -2821,6 +2830,10 @@ static void com_android_internal_os_Zygote_nativeAllowFilesOpenedByPreload(JNIEn
gPreloadFdsExtracted = true; gPreloadFdsExtracted = true;
} }
@ -263,7 +263,7 @@ index 21bbac0b0a7d..a7e4ea1624e6 100644
static const JNINativeMethod gMethods[] = { static const JNINativeMethod gMethods[] = {
{"nativeForkAndSpecialize", {"nativeForkAndSpecialize",
"(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/" "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/"
@@ -2686,6 +2699,7 @@ static const JNINativeMethod gMethods[] = { @@ -2873,6 +2886,7 @@ static const JNINativeMethod gMethods[] = {
(void*)com_android_internal_os_Zygote_nativeMarkOpenedFilesBeforePreload}, (void*)com_android_internal_os_Zygote_nativeMarkOpenedFilesBeforePreload},
{"nativeAllowFilesOpenedByPreload", "()V", {"nativeAllowFilesOpenedByPreload", "()V",
(void*)com_android_internal_os_Zygote_nativeAllowFilesOpenedByPreload}, (void*)com_android_internal_os_Zygote_nativeAllowFilesOpenedByPreload},

4
Patches/LineageOS-20.0/android_frameworks_base/0022-Ignore_StatementService_ANR.patch
View File

@ -12,10 +12,10 @@ they get a message each time it tries again.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 659d0f37bf05..3c785bfbe241 100644 index 987426f56463..b7e126607b38 100644
--- a/core/res/res/values/config.xml --- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml
@@ -3798,7 +3798,7 @@ @@ -3837,7 +3837,7 @@
<!-- List of comma separated package names for which we the system will not show crash, ANR, <!-- List of comma separated package names for which we the system will not show crash, ANR,
etc. dialogs. --> etc. dialogs. -->

10
Patches/LineageOS-20.0/android_frameworks_base/0023-Skip_Screen_Animation.patch
View File

@ -12,15 +12,15 @@ sensors.
1 file changed, 1 insertion(+), 1 deletion(-) 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 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 f64c2f322b81..dca07386a440 100644 index 83755c6591be..563f167828c9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -4049,7 +4049,7 @@ public class CentralSurfacesImpl extends CoreStartable implements @@ -3773,7 +3773,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
mScrimController.setExpansionAffectsAlpha(!unlocking);
boolean launchingAffordanceWithPreview = boolean launchingAffordanceWithPreview = mLaunchingAffordance;
mNotificationPanelViewController.isLaunchingAffordanceWithPreview();
- mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview); - mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview);
+ mScrimController.setLaunchingAffordanceWithPreview(true); + mScrimController.setLaunchingAffordanceWithPreview(true);
if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) { if (mStatusBarKeyguardViewManager.isShowingAlternateBouncer()) {
if (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED if (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED

34
Patches/LineageOS-20.0/android_frameworks_base/0024-Burnin_Protection.patch
View File

@ -43,10 +43,10 @@ index e1998ce3d3ab..dc59ccd794f7 100644
+ <dimen name="burnin_protection_vertical_shift">1dp</dimen> + <dimen name="burnin_protection_vertical_shift">1dp</dimen>
</resources> </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
index da5c78be3c01..bd0dd34cec60 100644 index 883903efb95f..2020910d88bf 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
@@ -162,6 +162,13 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab @@ -163,6 +163,13 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab
private FloatingRotationButton mFloatingRotationButton; private FloatingRotationButton mFloatingRotationButton;
private RotationButtonController mRotationButtonController; private RotationButtonController mRotationButtonController;
@ -60,7 +60,7 @@ index da5c78be3c01..bd0dd34cec60 100644
/** /**
* Helper that is responsible for showing the right toast when a disallowed activity operation * Helper that is responsible for showing the right toast when a disallowed activity operation
* occurred. In pinned mode, we show instructions on how to break out of this mode, whilst in * occurred. In pinned mode, we show instructions on how to break out of this mode, whilst in
@@ -879,12 +886,31 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab @@ -880,12 +887,31 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab
mContextualButtonGroup.setButtonVisibility(R.id.accessibility_button, visible); mContextualButtonGroup.setButtonVisibility(R.id.accessibility_button, visible);
} }
@ -93,18 +93,18 @@ index da5c78be3c01..bd0dd34cec60 100644
reloadNavIcons(); reloadNavIcons();
} }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java 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 dca07386a440..df02938f2718 100644 index 563f167828c9..53833ddd7659 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -229,6 +229,7 @@ import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent @@ -226,6 +226,7 @@ import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule;
import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;
import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.BrightnessMirrorController; import com.android.systemui.statusbar.policy.BrightnessMirrorController;
+import com.android.systemui.statusbar.policy.BurnInProtectionController; +import com.android.systemui.statusbar.policy.BurnInProtectionController;
import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -469,6 +470,7 @@ public class CentralSurfacesImpl extends CoreStartable implements @@ -453,6 +454,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
@Nullable @Nullable
protected LockscreenWallpaper mLockscreenWallpaper; protected LockscreenWallpaper mLockscreenWallpaper;
private final AutoHideController mAutoHideController; private final AutoHideController mAutoHideController;
@ -112,7 +112,7 @@ index dca07386a440..df02938f2718 100644
private final Point mCurrentDisplaySize = new Point(); private final Point mCurrentDisplaySize = new Point();
@@ -1220,6 +1222,12 @@ public class CentralSurfacesImpl extends CoreStartable implements @@ -1233,6 +1235,12 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
mNotificationPanelViewController.updatePanelExpansionAndVisibility(); mNotificationPanelViewController.updatePanelExpansionAndVisibility();
setBouncerShowingForStatusBarComponents(mBouncerShowing); setBouncerShowingForStatusBarComponents(mBouncerShowing);
checkBarModes(); checkBarModes();
@ -125,7 +125,7 @@ index dca07386a440..df02938f2718 100644
}); });
initializer.initializeStatusBar(mCentralSurfacesComponent); initializer.initializeStatusBar(mCentralSurfacesComponent);
@@ -3763,6 +3771,9 @@ public class CentralSurfacesImpl extends CoreStartable implements @@ -3488,6 +3496,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
updateNotificationPanelTouchState(); updateNotificationPanelTouchState();
mNotificationShadeWindowViewController.cancelCurrentTouch(); mNotificationShadeWindowViewController.cancelCurrentTouch();
@ -135,7 +135,7 @@ index dca07386a440..df02938f2718 100644
if (mLaunchCameraOnFinishedGoingToSleep) { if (mLaunchCameraOnFinishedGoingToSleep) {
mLaunchCameraOnFinishedGoingToSleep = false; mLaunchCameraOnFinishedGoingToSleep = false;
@@ -3867,6 +3878,9 @@ public class CentralSurfacesImpl extends CoreStartable implements @@ -3593,6 +3604,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
} }
} }
updateScrimController(); updateScrimController();
@ -146,7 +146,7 @@ index dca07386a440..df02938f2718 100644
}; };
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
index 3f37a352ed5f..b65cfe4fc4a1 100644 index 5692024fb473..d06a4bab4004 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone; @@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
@ -157,7 +157,7 @@ index 3f37a352ed5f..b65cfe4fc4a1 100644
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Rect; import android.graphics.Rect;
import android.inputmethodservice.InputMethodService; import android.inputmethodservice.InputMethodService;
@@ -60,6 +61,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { @@ -63,6 +64,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks {
private final CommandQueue mCommandQueue; private final CommandQueue mCommandQueue;
private final StatusBarContentInsetsProvider mContentInsetsProvider; private final StatusBarContentInsetsProvider mContentInsetsProvider;
@ -171,7 +171,7 @@ index 3f37a352ed5f..b65cfe4fc4a1 100644
private DarkReceiver mBattery; private DarkReceiver mBattery;
private ClockController mClockController; private ClockController mClockController;
private int mRotationOrientation = -1; private int mRotationOrientation = -1;
@@ -132,6 +140,18 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { @@ -135,6 +143,18 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks {
mTouchEventHandler = handler; mTouchEventHandler = handler;
} }
@ -187,10 +187,10 @@ index 3f37a352ed5f..b65cfe4fc4a1 100644
+ invalidate(); + invalidate();
+ } + }
+ +
@Override void init(StatusBarUserChipViewModel viewModel) {
public void onFinishInflate() { StatusBarUserSwitcherContainer container = findViewById(R.id.user_switcher_container);
super.onFinishInflate(); StatusBarUserChipViewBinder.bind(container, viewModel);
@@ -139,6 +159,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { @@ -147,6 +167,13 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks {
mClockController = new ClockController(getContext(), this); mClockController = new ClockController(getContext(), this);
mCutoutSpace = findViewById(R.id.cutout_space_view); mCutoutSpace = findViewById(R.id.cutout_space_view);

39
Patches/LineageOS-20.0/android_frameworks_base/0026-Crash_Details.patch
View File

@ -13,11 +13,11 @@ export them via the standard sharing UI.
core/res/res/layout/app_error_dialog.xml | 4 +- core/res/res/layout/app_error_dialog.xml | 4 +-
core/res/res/values/strings.xml | 3 + core/res/res/values/strings.xml | 3 +
core/res/res/values/symbols.xml | 3 + core/res/res/values/symbols.xml | 3 +
packages/SystemUI/AndroidManifest.xml | 13 ++ packages/SystemUI/AndroidManifest.xml | 12 ++
packages/SystemUI/res/values/strings.xml | 5 + packages/SystemUI/res/values/strings.xml | 5 +
.../android/systemui/ErrorReportActivity.kt | 159 ++++++++++++++++++ .../android/systemui/ErrorReportActivity.kt | 159 ++++++++++++++++++
.../java/com/android/server/am/AppErrors.java | 1 + .../java/com/android/server/am/AppErrors.java | 1 +
9 files changed, 200 insertions(+), 6 deletions(-) 9 files changed, 199 insertions(+), 6 deletions(-)
create mode 100644 packages/SystemUI/src/com/android/systemui/ErrorReportActivity.kt create mode 100644 packages/SystemUI/src/com/android/systemui/ErrorReportActivity.kt
diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java
@ -110,10 +110,10 @@ index c3b149a1e295..a47b82018377 100644
<Button <Button
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 2ea89de7d5cb..94e33f151798 100644 index 0e5b6a9d2596..b1062c60cb58 100644
--- a/core/res/res/values/strings.xml --- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml
@@ -6360,4 +6360,7 @@ ul.</string> @@ -6363,4 +6363,7 @@ ul.</string>
<!-- Title for preference of the system default locale. [CHAR LIMIT=50]--> <!-- Title for preference of the system default locale. [CHAR LIMIT=50]-->
<string name="system_locale_title">System default</string> <string name="system_locale_title">System default</string>
@ -122,10 +122,10 @@ index 2ea89de7d5cb..94e33f151798 100644
+ <string name="aerr_show_details">Show details</string> + <string name="aerr_show_details">Show details</string>
</resources> </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 888cd7a79bf6..c9733c9fa4f7 100644 index 7e3334874f98..96224c66399e 100644
--- a/core/res/res/values/symbols.xml --- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml
@@ -4852,6 +4852,9 @@ @@ -4881,5 +4881,8 @@
<java-symbol type="id" name="language_picker_item" /> <java-symbol type="id" name="language_picker_item" />
<java-symbol type="id" name="language_picker_header" /> <java-symbol type="id" name="language_picker_header" />
@ -133,17 +133,15 @@ index 888cd7a79bf6..c9733c9fa4f7 100644
+ <java-symbol type="string" name="aerr_show_details" /> + <java-symbol type="string" name="aerr_show_details" />
+ +
<java-symbol type="dimen" name="status_bar_height_default" /> <java-symbol type="dimen" name="status_bar_height_default" />
</resources>
<java-symbol type="bool" name="system_server_plays_face_haptics" />
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 2cc47823a109..b1ee372bd61a 100644 index 1d35548c0a25..eecb3615f390 100644
--- a/packages/SystemUI/AndroidManifest.xml --- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml
@@ -969,5 +969,18 @@ @@ -1004,6 +1004,18 @@
<action android:name="com.android.systemui.action.DISMISS_VOLUME_PANEL_DIALOG" />
</intent-filter> </intent-filter>
</receiver> </receiver>
+
+ <activity + <activity
+ android:name=".ErrorReportActivity" + android:name=".ErrorReportActivity"
+ android:exported="true" + android:exported="true"
@ -156,22 +154,25 @@ index 2cc47823a109..b1ee372bd61a 100644
+ </intent-filter> + </intent-filter>
+ </activity> + </activity>
+ +
</application> <provider
</manifest> android:authorities="com.android.systemui.customization"
android:name="com.android.systemui.keyguard.CustomizationProvider"
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 53f1227383b7..6abeae8f9c35 100644 index 977adde635aa..52bbd06a9776 100644
--- a/packages/SystemUI/res/values/strings.xml --- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml
@@ -2607,4 +2607,9 @@ @@ -2703,6 +2703,11 @@
<!-- Time format for the Dream Time Complication for 24-hour time format [CHAR LIMIT=NONE] --> <!-- Time format for the Dream Time Complication for 24-hour time format [CHAR LIMIT=NONE] -->
<string name="dream_time_complication_24_hr_time_format">kk:mm</string> <string name="dream_time_complication_24_hr_time_format">kk:mm</string>
+
+ <string name="error_report_title">Error in %1$s</string> + <string name="error_report_title">Error in %1$s</string>
+ <string name="copy_to_clipboard">Copy to clipboard</string> + <string name="copy_to_clipboard">Copy to clipboard</string>
+ <string name="copied_to_clipboard">Copied to clipboard</string> + <string name="copied_to_clipboard">Copied to clipboard</string>
+ <string name="error_share">Share</string> + <string name="error_share">Share</string>
</resources> +
<!--
Template for an action that opens a specific app. [CHAR LIMIT=16]
-->
diff --git a/packages/SystemUI/src/com/android/systemui/ErrorReportActivity.kt b/packages/SystemUI/src/com/android/systemui/ErrorReportActivity.kt diff --git a/packages/SystemUI/src/com/android/systemui/ErrorReportActivity.kt b/packages/SystemUI/src/com/android/systemui/ErrorReportActivity.kt
new file mode 100644 new file mode 100644
index 000000000000..94630b044fbe index 000000000000..94630b044fbe

6
Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-1.patch
View File

@ -9,10 +9,10 @@ This is needed for properly verifying updates of system packages.
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
index 302d845e7f15..a45a42aafcf8 100644 index 2210f7362d5c..b5f6a2e99062 100644
--- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
+++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
@@ -155,7 +155,7 @@ public class PackageManagerServiceUtils { @@ -161,7 +161,7 @@ public class PackageManagerServiceUtils {
/** /**
* The initial enabled state of the cache before other checks are done. * The initial enabled state of the cache before other checks are done.
*/ */
@ -21,7 +21,7 @@ index 302d845e7f15..a45a42aafcf8 100644
/** /**
* Whether to skip all other checks and force the cache to be enabled. * Whether to skip all other checks and force the cache to be enabled.
@@ -1297,6 +1297,7 @@ public class PackageManagerServiceUtils { @@ -1310,6 +1310,7 @@ public class PackageManagerServiceUtils {
boolean isUserDebugBuild, String incrementalVersion) { boolean isUserDebugBuild, String incrementalVersion) {
if (!FORCE_PACKAGE_PARSED_CACHE_ENABLED) { if (!FORCE_PACKAGE_PARSED_CACHE_ENABLED) {
if (!DEFAULT_PACKAGE_PARSER_CACHE_ENABLED) { if (!DEFAULT_PACKAGE_PARSER_CACHE_ENABLED) {

4
Patches/LineageOS-20.0/android_frameworks_base/0032-SUPL_Toggle.patch
View File

@ -11,10 +11,10 @@ Change-Id: I5c31c319d198f09ace493e601278f8224a259f05
3 files changed, 40 insertions(+) 3 files changed, 40 insertions(+)
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e12274516a55..1ccb146429f2 100644 index 206e9454b3a0..c62d585ac1c2 100644
--- a/core/java/android/provider/Settings.java --- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java
@@ -17245,6 +17245,15 @@ public final class Settings { @@ -17279,6 +17279,15 @@ public final class Settings {
*/ */
public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout"; public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout";

12
Patches/LineageOS-20.0/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
View File

@ -14,10 +14,10 @@ based on https://github.com/GrapheneOS/platform_frameworks_opt_net_wifi/commit/a
2 files changed, 25 insertions(+), 8 deletions(-) 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 diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index bdb051094..7eaade10c 100644 index f3ce32606..0b1f3411f 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -268,7 +268,7 @@ public class StandardWifiEntry extends WifiEntry { @@ -269,7 +269,7 @@ public class StandardWifiEntry extends WifiEntry {
return wifiInfoMac; return wifiInfoMac;
} }
} }
@ -26,7 +26,7 @@ index bdb051094..7eaade10c 100644
final String[] factoryMacs = mWifiManager.getFactoryMacAddresses(); final String[] factoryMacs = mWifiManager.getFactoryMacAddresses();
if (factoryMacs.length > 0) { if (factoryMacs.length > 0) {
return factoryMacs[0]; return factoryMacs[0];
@@ -552,12 +552,18 @@ public class StandardWifiEntry extends WifiEntry { @@ -553,12 +553,18 @@ public class StandardWifiEntry extends WifiEntry {
@Override @Override
@Privacy @Privacy
public synchronized int getPrivacy() { public synchronized int getPrivacy() {
@ -50,7 +50,7 @@ index bdb051094..7eaade10c 100644
} }
} }
@@ -567,11 +573,21 @@ public class StandardWifiEntry extends WifiEntry { @@ -568,11 +574,21 @@ public class StandardWifiEntry extends WifiEntry {
return; return;
} }
@ -75,10 +75,10 @@ index bdb051094..7eaade10c 100644
public synchronized boolean isAutoJoinEnabled() { public synchronized boolean isAutoJoinEnabled() {
if (mTargetWifiConfig == null) { if (mTargetWifiConfig == null) {
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
index f346c6179..a33f6328f 100644 index d7120988c..d341046c0 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
@@ -137,6 +137,7 @@ public class WifiEntry { @@ -138,6 +138,7 @@ public class WifiEntry {
public static final int PRIVACY_DEVICE_MAC = 0; public static final int PRIVACY_DEVICE_MAC = 0;
public static final int PRIVACY_RANDOMIZED_MAC = 1; public static final int PRIVACY_RANDOMIZED_MAC = 1;
public static final int PRIVACY_UNKNOWN = 2; public static final int PRIVACY_UNKNOWN = 2;

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

@ -81,10 +81,10 @@ index 12e29e693b..b6745806b5 100644
android:id="@+id/private_dns_mode_opportunistic" android:id="@+id/private_dns_mode_opportunistic"
layout="@layout/preference_widget_dialog_radiobutton"/> layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 9f4cbeebc3..ee474b56b6 100644 index 45bab9b84f..b532e8c020 100644
--- a/res/values/cm_strings.xml --- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml
@@ -153,6 +153,21 @@ @@ -148,6 +148,21 @@
<string name="data_usage_app_restrict_wifi">Wi\u2011Fi data</string> <string name="data_usage_app_restrict_wifi">Wi\u2011Fi data</string>
<string name="data_usage_app_restrict_wifi_summary">Enable usage of Wi\u2011Fi data</string> <string name="data_usage_app_restrict_wifi_summary">Enable usage of Wi\u2011Fi data</string>

4
Patches/LineageOS-20.0/android_packages_apps_Settings/0005-Automatic_Reboot.patch
View File

@ -13,7 +13,7 @@ Subject: [PATCH] add auto-reboot setting
create mode 100644 src/com/android/settings/security/AutoRebootPreferenceController.java create mode 100644 src/com/android/settings/security/AutoRebootPreferenceController.java
diff --git a/res/values/arrays.xml b/res/values/arrays.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0632f72eb0..35e3247663 100644 index 42d60eee98..a6a6e62166 100644
--- a/res/values/arrays.xml --- a/res/values/arrays.xml
+++ b/res/values/arrays.xml +++ b/res/values/arrays.xml
@@ -158,6 +158,37 @@ @@ -158,6 +158,37 @@
@ -55,7 +55,7 @@ index 0632f72eb0..35e3247663 100644
<item msgid="6490061470416867723">Small</item> <item msgid="6490061470416867723">Small</item>
<item msgid="3579015730662088893">Default</item> <item msgid="3579015730662088893">Default</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index bbdefd1427..c1aaf40f96 100644 index d8a2c3b41c..666d84a266 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -706,6 +706,9 @@ @@ -706,6 +706,9 @@

4
Patches/LineageOS-20.0/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch
View File

@ -12,7 +12,7 @@ Subject: [PATCH] add bluetooth auto-turn-off setting
create mode 100644 src/com/android/settings/bluetooth/BluetoothTimeoutPreferenceController.java create mode 100644 src/com/android/settings/bluetooth/BluetoothTimeoutPreferenceController.java
diff --git a/res/values/arrays.xml b/res/values/arrays.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 35e3247663..5adc98d256 100644 index a6a6e62166..d33c0dd9c5 100644
--- a/res/values/arrays.xml --- a/res/values/arrays.xml
+++ b/res/values/arrays.xml +++ b/res/values/arrays.xml
@@ -39,6 +39,50 @@ @@ -39,6 +39,50 @@
@ -67,7 +67,7 @@ index 35e3247663..5adc98d256 100644
<string-array name="screen_timeout_entries"> <string-array name="screen_timeout_entries">
<item>15 seconds</item> <item>15 seconds</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1aaf40f96..7ea1708b72 100644 index 666d84a266..90244134e5 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -27,6 +27,25 @@ @@ -27,6 +27,25 @@

4
Patches/LineageOS-20.0/android_packages_apps_Settings/0007-WiFi_Timeout.patch
View File

@ -12,7 +12,7 @@ Subject: [PATCH] add Wi-Fi timeout feature
create mode 100644 src/com/android/settings/wifi/WifiTimeoutPreferenceController.java create mode 100644 src/com/android/settings/wifi/WifiTimeoutPreferenceController.java
diff --git a/res/values/arrays.xml b/res/values/arrays.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5adc98d256..9cac9fbee2 100644 index d33c0dd9c5..bb5fdd8762 100644
--- a/res/values/arrays.xml --- a/res/values/arrays.xml
+++ b/res/values/arrays.xml +++ b/res/values/arrays.xml
@@ -83,6 +83,50 @@ @@ -83,6 +83,50 @@
@ -67,7 +67,7 @@ index 5adc98d256..9cac9fbee2 100644
<string-array name="screen_timeout_entries"> <string-array name="screen_timeout_entries">
<item>15 seconds</item> <item>15 seconds</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ea1708b72..59afb3e23a 100644 index 90244134e5..bb655e02de 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -46,6 +46,25 @@ @@ -46,6 +46,25 @@

2
Patches/LineageOS-20.0/android_packages_apps_Settings/0008-ptrace_scope.patch
View File

@ -12,7 +12,7 @@ Subject: [PATCH] add native debugging setting
create mode 100644 src/com/android/settings/security/NativeDebugPreferenceController.java create mode 100644 src/com/android/settings/security/NativeDebugPreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59afb3e23a..22ac15ca31 100644 index bb655e02de..28d546132c 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -747,6 +747,9 @@ @@ -747,6 +747,9 @@

4
Patches/LineageOS-20.0/android_packages_apps_Settings/0009-Install_Restrictions.patch
View File

@ -10,10 +10,10 @@ Subject: [PATCH] UserManager app installation restrictions
3 files changed, 44 insertions(+), 5 deletions(-) 3 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5318c00777..27364b13dd 100644 index 77aafa7622..f301adc9e4 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -7979,6 +7979,8 @@ @@ -8017,6 +8017,8 @@
<string name="user_enable_calling">Turn on phone calls</string> <string name="user_enable_calling">Turn on phone calls</string>
<!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] --> <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
<string name="user_enable_calling_sms">Turn on phone calls &amp; SMS</string> <string name="user_enable_calling_sms">Turn on phone calls &amp; SMS</string>

2
Patches/LineageOS-20.0/android_packages_apps_Settings/0010-exec_spawning_toggle.patch
View File

@ -12,7 +12,7 @@ Subject: [PATCH] add exec spawning toggle
create mode 100644 src/com/android/settings/security/ExecSpawnPreferenceController.java create mode 100644 src/com/android/settings/security/ExecSpawnPreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22ac15ca31..5318c00777 100644 index 28d546132c..77aafa7622 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -747,6 +747,9 @@ @@ -747,6 +747,9 @@

6
Patches/LineageOS-20.0/android_packages_apps_Settings/0011-Random_MAC.patch
View File

@ -26,10 +26,10 @@ index f91f7385c1..c0907b19ee 100644
<LinearLayout <LinearLayout
diff --git a/res/values/arrays.xml b/res/values/arrays.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9cac9fbee2..cfc7671652 100644 index bb5fdd8762..b061e1c3d4 100644
--- a/res/values/arrays.xml --- a/res/values/arrays.xml
+++ b/res/values/arrays.xml +++ b/res/values/arrays.xml
@@ -1398,6 +1398,12 @@ @@ -1412,6 +1412,12 @@
<item>Treat as unmetered</item> <item>Treat as unmetered</item>
</string-array> </string-array>
@ -42,7 +42,7 @@ index 9cac9fbee2..cfc7671652 100644
<string-array name="wifi_privacy_entries"> <string-array name="wifi_privacy_entries">
<item>Use randomized MAC (default)</item> <item>Use randomized MAC (default)</item>
<item>Use device MAC</item> <item>Use device MAC</item>
@@ -1415,6 +1421,7 @@ @@ -1429,6 +1435,7 @@
</string-array> </string-array>
<string-array name="wifi_privacy_values" translatable="false"> <string-array name="wifi_privacy_values" translatable="false">

2
Patches/LineageOS-20.0/android_packages_apps_Settings/0012-hosts_toggle.patch
View File

@ -16,7 +16,7 @@ Change-Id: Ic01a142722372d9d57f52947025cd9db23e58ef4
create mode 100644 src/com/android/settings/security/HostsPreferenceController.java create mode 100644 src/com/android/settings/security/HostsPreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 27364b13dd..fa753aaa8e 100644 index f301adc9e4..0c76a67d90 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -753,6 +753,9 @@ @@ -753,6 +753,9 @@

6
Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
View File

@ -25,7 +25,7 @@ Change-Id: I8a762d0f29ac42fce3dcfc7189e8ff216a8f8d1a
create mode 100644 src/com/android/settings/network/ConnectivityCheckPreferenceController.java create mode 100644 src/com/android/settings/network/ConnectivityCheckPreferenceController.java
diff --git a/res/values/arrays.xml b/res/values/arrays.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index cfc7671652..fda8ff7f8c 100644 index b061e1c3d4..2e7ab0498c 100644
--- a/res/values/arrays.xml --- a/res/values/arrays.xml
+++ b/res/values/arrays.xml +++ b/res/values/arrays.xml
@@ -210,6 +210,36 @@ @@ -210,6 +210,36 @@
@ -66,10 +66,10 @@ index cfc7671652..fda8ff7f8c 100644
These are shown in a list dialog. --> These are shown in a list dialog. -->
<string-array name="lock_after_timeout_entries"> <string-array name="lock_after_timeout_entries">
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa753aaa8e..858d5a6588 100644 index 0c76a67d90..ec42a3637e 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -14456,4 +14456,7 @@ @@ -14509,4 +14509,7 @@
<!-- [CHAR LIMIT=NONE] Hint for QR code process failure --> <!-- [CHAR LIMIT=NONE] Hint for QR code process failure -->
<string name="bt_le_audio_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string> <string name="bt_le_audio_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string>

6
Patches/LineageOS-20.0/android_packages_apps_Settings/0014-LTE_Only_Mode-1.patch
View File

@ -11,10 +11,10 @@ Co-authored-by: inthewaves <inthewaves@pm.me>
3 files changed, 31 insertions(+), 2 deletions(-) 3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 858d5a6588..3ca2c3f273 100644 index ec42a3637e..e68a5595ab 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -13032,6 +13032,8 @@ @@ -13078,6 +13078,8 @@
<string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string> <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string>
<!-- LTE [CHAR LIMIT=NONE] --> <!-- LTE [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string> <string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string>
@ -23,7 +23,7 @@ index 858d5a6588..3ca2c3f273 100644
<!-- GSM/WCDMA/LTE [CHAR LIMIT=NONE] --> <!-- GSM/WCDMA/LTE [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string> <string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
<!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] --> <!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] -->
@@ -13097,8 +13099,12 @@ @@ -13143,8 +13145,12 @@
<string name="network_4G_pure" translatable="false">4G</string> <string name="network_4G_pure" translatable="false">4G</string>
<!-- Text for Network lte [CHAR LIMIT=NONE] --> <!-- Text for Network lte [CHAR LIMIT=NONE] -->
<string name="network_lte">LTE (recommended)</string> <string name="network_lte">LTE (recommended)</string>

4
Patches/LineageOS-20.0/android_packages_apps_Settings/0015-SUPL_Toggle.patch
View File

@ -11,10 +11,10 @@ Subject: [PATCH] add a toggle for forcibly disabling SUPL
create mode 100644 src/com/android/settings/location/ForceDisableSuplPrefController.java create mode 100644 src/com/android/settings/location/ForceDisableSuplPrefController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3ca2c3f273..a2b4120e12 100644 index e68a5595ab..553038c2b4 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -14465,4 +14465,6 @@ @@ -14518,4 +14518,6 @@
<string name="connectivity_check_title">Internet connectivity check</string> <string name="connectivity_check_title">Internet connectivity check</string>
<string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string> <string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string>

2
Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch
View File

@ -63,7 +63,7 @@ index e988679fac..b7f4692198 100644
/** /**
* Set the MAC randomization setting for this network. * Set the MAC randomization setting for this network.
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 2079cb82d0..335688e266 100644 index d3e20bef27..1c7d700268 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java --- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -466,6 +466,9 @@ public class WifiConfigManager { @@ -466,6 +466,9 @@ public class WifiConfigManager {

2
Patches/LineageOS-20.0/android_system_core/0001-Harden.patch
View File

@ -37,7 +37,7 @@ index d050ed783..e828916d6 100644
CHECKCALL(mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11))); CHECKCALL(mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11)));
diff --git a/rootdir/init.rc b/rootdir/init.rc diff --git a/rootdir/init.rc b/rootdir/init.rc
index c56f86089..3ab24300f 100644 index 02e51d2c4..5afdb6904 100644
--- a/rootdir/init.rc --- a/rootdir/init.rc
+++ b/rootdir/init.rc +++ b/rootdir/init.rc
@@ -330,6 +330,17 @@ on init @@ -330,6 +330,17 @@ on init

4
Patches/LineageOS-20.0/android_system_core/0002-ptrace_scope.patch
View File

@ -9,10 +9,10 @@ Signed-off-by: anupritaisno1 <www.anuprita804@gmail.com>
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/rootdir/init.rc b/rootdir/init.rc diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3ab24300f..be0604271 100644 index 5afdb6904..a9eb83f76 100644
--- a/rootdir/init.rc --- a/rootdir/init.rc
+++ b/rootdir/init.rc +++ b/rootdir/init.rc
@@ -1216,6 +1216,12 @@ on property:perf.drop_caches=3 @@ -1222,6 +1222,12 @@ on property:perf.drop_caches=3
on property:net.tcp_def_init_rwnd=* on property:net.tcp_def_init_rwnd=*
write /proc/sys/net/ipv4/tcp_default_init_rwnd ${net.tcp_def_init_rwnd} write /proc/sys/net/ipv4/tcp_default_init_rwnd ${net.tcp_def_init_rwnd}

4
Patches/LineageOS-20.0/android_system_core/0003-HM-Increase_vm_mmc.patch
View File

@ -9,10 +9,10 @@ Signed-off-by: anupritaisno1 <www.anuprita804@gmail.com>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/rootdir/init.rc b/rootdir/init.rc diff --git a/rootdir/init.rc b/rootdir/init.rc
index be0604271..fb960eed7 100644 index a9eb83f76..ffad28d97 100644
--- a/rootdir/init.rc --- a/rootdir/init.rc
+++ b/rootdir/init.rc +++ b/rootdir/init.rc
@@ -1101,6 +1101,8 @@ on boot @@ -1107,6 +1107,8 @@ on boot
symlink /sys/class/block/${dev.mnt.dev.data} /dev/sys/block/by-name/userdata 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 symlink /sys/class/block/${dev.mnt.rootdisk.data} /dev/sys/block/by-name/rootdisk

4
Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch
View File

@ -77,7 +77,7 @@ index f235b35b7..895b8f1df 100644
persist.logd. u:object_r:logd_prop:s0 persist.logd. u:object_r:logd_prop:s0
ro.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 diff --git a/prebuilts/api/33.0/private/property_contexts b/prebuilts/api/33.0/private/property_contexts
index 5a04be1d2..ebb3ce102 100644 index c39f2cce0..5dc9a1a89 100644
--- a/prebuilts/api/33.0/private/property_contexts --- a/prebuilts/api/33.0/private/property_contexts
+++ b/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 @@ -58,6 +58,7 @@ persist.nfc. u:object_r:nfc_prop:s0
@ -89,7 +89,7 @@ index 5a04be1d2..ebb3ce102 100644
persist.logd. u:object_r:logd_prop:s0 persist.logd. u:object_r:logd_prop:s0
ro.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 diff --git a/private/property_contexts b/private/property_contexts
index 5a04be1d2..ebb3ce102 100644 index c39f2cce0..5dc9a1a89 100644
--- a/private/property_contexts --- a/private/property_contexts
+++ b/private/property_contexts +++ b/private/property_contexts
@@ -58,6 +58,7 @@ persist.nfc. u:object_r:nfc_prop:s0 @@ -58,6 +58,7 @@ persist.nfc. u:object_r:nfc_prop:s0

5
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh
View File

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
if cd "$DOS_BUILD_BASE""kernel/fairphone/sm7225"; then if cd "$DOS_BUILD_BASE""kernel/fairphone/sm7225"; then
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0272-0273.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0274-0275.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch 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/0003-syzkaller-Misc2/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.19/0004.patch
@ -70,7 +68,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/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-3061/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3707/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch
@ -81,7 +78,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
editKernelLocalversion "-dos.p81" editKernelLocalversion "-dos.p78"
else echo "kernel_fairphone_sm7225 is unavailable, not patching."; else echo "kernel_fairphone_sm7225 is unavailable, not patching.";
fi; fi;
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

104
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh
View File

@ -1,10 +1,8 @@
#!/bin/bash #!/bin/bash
if cd "$DOS_BUILD_BASE""kernel/google/gs201/private/gs-google"; then if cd "$DOS_BUILD_BASE""kernel/google/gs201/private/gs-google"; then
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0115-0116.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0122-0123.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0125-0126.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0138-0139.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0150-0151.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0150-0151.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0154-0155.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0157-0158.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0166-0167.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/5.10/5.10.0166-0167.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/5.10/0005.patch
@ -41,72 +39,18 @@ 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-16119/^5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3669/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3669/^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3759/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3759/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4037/5.10/0002.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29648/^5.11/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29648/^5.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33061/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33061/^5.17/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0171/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0480/4.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0480/4.9-^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/5.10/0028.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1158/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/5.10/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0016.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0017.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0018.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0019.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1204/5.10/0020.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.14/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1508/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1652/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1729/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1836/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1966/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1972/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1974/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1975/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0011.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/5.10/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2196/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2196/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2209/5.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2380/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2586/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2588/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2602/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2602/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2663/5.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2873/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2873/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2905/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2977/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3078/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3104/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3107/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3111/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3112/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3113/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3114/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3114/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3115/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3169/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3169/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3239/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3303/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3344/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3344/^6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/5.10/0005.patch
@ -116,70 +60,32 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/5.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/5.10/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/^6.0/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/^6.0/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3586/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3623/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3623/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3629/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3633/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/5.10/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/5.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/5.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3707/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3707/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4139/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/5.10/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/5.10/0010.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/5.10/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4696/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4696/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-21505/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26490/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28389/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28893/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-32981/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33740/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33741/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33742/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33743/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33744/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-34918/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41858/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896/4.5-^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896/4.5-^6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/^6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47518/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47518/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47519/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47519/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47520/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47520/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47521/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47521/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47946/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0179/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0179/5.10/0002.patch
@ -192,7 +98,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1073/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1073/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1074/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1074/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1078/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1078/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1095/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0004.patch
@ -202,9 +107,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26607/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28327/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28327/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/5.10/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/5.10/0006.patch
editKernelLocalversion "-dos.p204" editKernelLocalversion "-dos.p110"
else echo "kernel_google_gs201_private_gs-google is unavailable, not patching."; else echo "kernel_google_gs201_private_gs-google is unavailable, not patching.";
fi; fi;
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

23
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if cd "$DOS_BUILD_BASE""kernel/google/msm-4.14"; then if cd "$DOS_BUILD_BASE""kernel/google/msm-4.14"; then
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0289-0290.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0296-0297.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0306-0307.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0306-0307.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch 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/0003-syzkaller-Misc2/ANY/0001.patch
@ -67,16 +67,9 @@ 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-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-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-3493/^5.10/0001.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-28039/^5.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.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-2588/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/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-3061/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3239/4.14/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/4.14/0005.patch
@ -84,34 +77,24 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/4.14/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3586/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3629/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.14/0002.patch 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-4378/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/4.14/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.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-20382/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/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-40307/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/4.14/0002.patch
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-42895/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/^6.1/0001.patch
@ -124,14 +107,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0461/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1073/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1073/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1074/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1074/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1095/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26607/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.14/0003.patch
editKernelLocalversion "-dos.p131" editKernelLocalversion "-dos.p114"
else echo "kernel_google_msm-4.14 is unavailable, not patching."; else echo "kernel_google_msm-4.14 is unavailable, not patching.";
fi; fi;
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

28
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if cd "$DOS_BUILD_BASE""kernel/google/redbull"; then if cd "$DOS_BUILD_BASE""kernel/google/redbull"; then
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0253-0254.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0265-0266.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch 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/0003-syzkaller-Misc2/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.19/0004.patch
@ -63,43 +63,30 @@ 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-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-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-3493/^5.10/0001.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-28039/^5.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.19/0003.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-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-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-2873/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2873/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/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-3061/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3104/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3104/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3535/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3564/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3577/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3586/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3628/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3629/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3635/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3707/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3707/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch 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-4378/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4378/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
@ -107,15 +94,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.19/0007.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-20382/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/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
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/4.19/0003.patch
@ -136,14 +116,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1073/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1073/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1074/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1074/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1078/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1078/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1095/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26607/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.19/0004.patch
editKernelLocalversion "-dos.p143" editKernelLocalversion "-dos.p123"
else echo "kernel_google_redbull is unavailable, not patching."; else echo "kernel_google_redbull is unavailable, not patching.";
fi; fi;
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

5
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh
View File

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
if cd "$DOS_BUILD_BASE""kernel/oneplus/sm8250"; then if cd "$DOS_BUILD_BASE""kernel/oneplus/sm8250"; then
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0272-0273.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0274-0275.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch 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/0003-syzkaller-Misc2/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.19/0003.patch
@ -68,7 +66,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/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-3061/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3707/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch
@ -79,7 +76,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
editKernelLocalversion "-dos.p79" editKernelLocalversion "-dos.p76"
else echo "kernel_oneplus_sm8250 is unavailable, not patching."; else echo "kernel_oneplus_sm8250 is unavailable, not patching.";
fi; fi;
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
if cd "$DOS_BUILD_BASE""kernel/razer/sdm845"; then if cd "$DOS_BUILD_BASE""kernel/razer/sdm845"; then
git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0015.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0020.patch
@ -85,7 +86,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/000
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.9/0005.patch
editKernelLocalversion "-dos.p85" editKernelLocalversion "-dos.p86"
else echo "kernel_razer_sdm845 is unavailable, not patching."; else echo "kernel_razer_sdm845 is unavailable, not patching.";
fi; fi;
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"