Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-06-28 23:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

FP4 + Churn

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-08-08 14:02:58 -04:00
parent e0b57197ea
commit 0ffbe79e1a
6 changed files with 19 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Manifests/Manifest_LAOS-19.1.xml
View File

@ -75,8 +75,8 @@
<project path="kernel/fairphone/sdm632" name="LineageOS/android_kernel_fairphone_sdm632" remote="github" />
<!-- Fairphone 4 (FP4) -->
<project path="device/fairphone/FP4" name="WeAreFairphone/android_device_fairphone_FP4" remote="github" revision="staging/lineage-19.1" />
<project path="kernel/fairphone/sm7225" name="WeAreFairphone/android_kernel_fairphone_sm7225" remote="github" revision="staging/lineage-19.1" />
<project path="device/fairphone/FP4" name="LineageOS/android_device_fairphone_FP4" remote="github" />
<project path="kernel/fairphone/sm7225" name="LineageOS/android_kernel_fairphone_sm7225" remote="github" />
<!-- Google Pixel 2 (taimen/walleye) -->
<project path="device/google/taimen" name="LineageOS/android_device_google_taimen" remote="github" />

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

@ -41,7 +41,7 @@ index d7cc36ff4ae2..72e6362c0a96 100644
* Control whether to enable adaptive sleep mode.
* @hide
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
index 02632cb3fc17..ea97abd4c423 100644
index b732ef6b873a..d500270464c3 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -117,7 +117,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@ -89,7 +89,7 @@ index 02632cb3fc17..ea97abd4c423 100644
mConfigurationController = configurationController;
mDeviceProvisionedController = deviceProvisionedController;
mBroadcastDispatcher = broadcastDispatcher;
@@ -441,10 +452,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -468,10 +479,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
},
UserHandle.USER_ALL);
@ -100,7 +100,7 @@ index 02632cb3fc17..ea97abd4c423 100644
mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor);
mConfigurationController.addCallback(mConfigurationListener);
@@ -452,8 +459,8 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -479,8 +486,8 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Upon boot, make sure we have the most up to date colors
Runnable updateColors = () -> {
@ -111,7 +111,7 @@ index 02632cb3fc17..ea97abd4c423 100644
Runnable applyColors = () -> {
if (DEBUG) Log.d(TAG, "Boot colors: " + systemColor);
mCurrentColors.put(mUserTracker.getUserId(), systemColor);
@@ -479,7 +486,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -506,7 +513,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@Override
public void onFinishedGoingToSleep() {
final int userId = mUserTracker.getUserId();
@ -120,7 +120,7 @@ index 02632cb3fc17..ea97abd4c423 100644
if (colors != null) {
int flags = mDeferredWallpaperColorsFlags.get(userId);
@@ -490,10 +497,27 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -517,10 +524,27 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
}
}
});
@ -149,7 +149,7 @@ index 02632cb3fc17..ea97abd4c423 100644
final int mainColor;
final int accentCandidate;
if (currentColors == null) {
@@ -512,14 +536,12 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -539,14 +563,12 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
mMainWallpaperColor = mainColor;
mWallpaperAccentColor = accentCandidate;
@ -170,7 +170,7 @@ index 02632cb3fc17..ea97abd4c423 100644
}
updateThemeOverlays();
@@ -593,7 +615,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -620,7 +642,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Let's generate system overlay if the style picker decided to override it.
OverlayIdentifier systemPalette = categoryToPackage.get(OVERLAY_CATEGORY_SYSTEM_PALETTE);
@ -179,7 +179,7 @@ index 02632cb3fc17..ea97abd4c423 100644
try {
String colorString = systemPalette.getPackageName().toLowerCase();
if (!colorString.startsWith("#")) {
@@ -607,20 +629,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -634,20 +656,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Color.parseColor doesn't catch any exceptions from the calls it makes
Log.w(TAG, "Invalid color definition: " + systemPalette.getPackageName(), e);
}
@ -201,7 +201,7 @@ index 02632cb3fc17..ea97abd4c423 100644
try {
String colorString = accentPalette.getPackageName().toLowerCase();
if (!colorString.startsWith("#")) {
@@ -634,7 +647,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -661,7 +674,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
// Color.parseColor doesn't catch any exceptions from the calls it makes
Log.w(TAG, "Invalid color definition: " + accentPalette.getPackageName(), e);
}
@ -210,7 +210,7 @@ index 02632cb3fc17..ea97abd4c423 100644
try {
Integer.parseInt(accentPalette.getPackageName().toLowerCase(), 16);
categoryToPackage.remove(OVERLAY_CATEGORY_ACCENT_COLOR);
@@ -692,7 +705,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@@ -719,7 +732,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
pw.println("mWallpaperAccentColor=" + Integer.toHexString(mWallpaperAccentColor));
pw.println("mSecondaryOverlay=" + mSecondaryOverlay);
pw.println("mNeutralOverlay=" + mNeutralOverlay);

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

@ -76,10 +76,10 @@ index a3ee437..c4532c5 100644
The array should be sorted in the same order as the
touchscreen gestures advertised by the device's LineageHW impl. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9d88587..7ce522a 100644
index 02a5316..a806a7c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -532,28 +532,6 @@
@@ -533,28 +533,6 @@
<b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
<b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>

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

@ -81,7 +81,7 @@ index 12e29e693b..b6745806b5 100644
android:id="@+id/private_dns_mode_opportunistic"
layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e89ab77edd..925a386cd9 100644
index 14d88d1960..9994318ef6 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -78,6 +78,21 @@

28
Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh
View File

@ -82,7 +82,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28374/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28941/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/^5.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0011.patch
@ -122,10 +121,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/4.19/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0010.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.19/0003.patch
@ -156,7 +151,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.19/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.19/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22600/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26401/4.19/0007.patch
@ -223,13 +217,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39698/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39698/4.19/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39698/4.19/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39698/4.19/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39698/4.19/0010.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39714/4.19/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch
@ -251,7 +238,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0812/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0847/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0886/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.19/0003.patch
@ -278,16 +264,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2380/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20008/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0010.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0011.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20132/4.19/0013.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.19/0004.patch
@ -298,8 +274,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/^5.19/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.19/0003.patch
@ -322,5 +296,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch
editKernelLocalversion "-dos.p322"
editKernelLocalversion "-dos.p296"
cd "$DOS_BUILD_BASE"

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

@ -81,7 +81,7 @@ buildAll() {
#SD632
buildDevice FP3 avb;
#SD750
buildDevice FP4 avb;
buildDevice FP4 avb; #unb
#SD855
buildDevice guacamole avb; #unb
buildDevice guacamoleb avb; #unb
@ -89,7 +89,7 @@ buildAll() {
buildDevice hotdogb avb; #unb
buildDevice coral avb;
buildDevice flame avb;
buildDevice vayu avb; #unb
buildDevice vayu avb;
#SD865
buildDevice instantnoodle avb; #unb
buildDevice instantnoodlep avb; #unb
@ -118,6 +118,7 @@ patchWorkspace() {
source build/envsetup.sh;
repopick -it S_asb_2022-08;
repopick -i 335090 335091; #FP4 Bluetooth fixes
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";