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

Picks

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-11-09 17:13:44 -05:00
parent 0b102adb1d
commit 77b7de4b1e
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
8 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Patches/Common/apns-conf.xml
View File

@ -518,7 +518,7 @@
<apn carrier="HoT Internet" mcc="232" mnc="07" apn="webaut" type="default,supl" /> <apn carrier="HoT Internet" mcc="232" mnc="07" apn="webaut" type="default,supl" />
<apn carrier="HoT MMS" mcc="232" mnc="07" apn="mmsaut" mmsc="http://mmsaut.at/send" mmsproxy="212.95.31.50" mmsport="80" type="mms" /> <apn carrier="HoT MMS" mcc="232" mnc="07" apn="mmsaut" mmsc="http://mmsaut.at/send" mmsproxy="212.95.31.50" mmsport="80" type="mms" />
<apn carrier="3 AT" mcc="232" mnc="10" apn="drei.at" server="http://mobile.drei.at" mmsc="http://mmsc" mmsproxy="213.94.78.133" mmsport="8799" type="default,supl,mms" /> <apn carrier="3 AT" mcc="232" mnc="10" apn="drei.at" server="http://mobile.drei.at" mmsc="http://mmsc" mmsproxy="213.94.78.133" mmsport="8799" type="default,supl,mms" />
<apn carrier="Bob" mcc="232" mnc="11" apn="data.bob" user="data@bob.at" password="ppp" type="default,supl" /> <apn carrier="Bob" mcc="232" mnc="11" apn="bob.at" user="data@bob.at" password="ppp" protocol="IPV4V6" type="default,supl" />
<apn carrier="Bob MMS" mcc="232" mnc="11" apn="mms.bob.at" user="data@bob.at" password="ppp" mmsc="http://mmsc.bob.at" mmsproxy="194.48.124.7" mmsport="8001" type="mms" /> <apn carrier="Bob MMS" mcc="232" mnc="11" apn="mms.bob.at" user="data@bob.at" password="ppp" mmsc="http://mmsc.bob.at" mmsproxy="194.48.124.7" mmsport="8001" type="mms" />
<apn carrier="Yesss" mcc="232" mnc="12" apn="webapn.at" protocol="IPV4V6" type="default,supl" /> <apn carrier="Yesss" mcc="232" mnc="12" apn="webapn.at" protocol="IPV4V6" type="default,supl" />
<apn carrier="T-Mobile A Internet" mcc="232" mnc="13" apn="internet.t-mobile.at" user="t-mobile" password="tm" authtype="1" type="default,supl" /> <apn carrier="T-Mobile A Internet" mcc="232" mnc="13" apn="internet.t-mobile.at" user="t-mobile" password="tm" authtype="1" type="default,supl" />
@ -1320,7 +1320,7 @@
<apn carrier="WCW Internet" mcc="310" mnc="180" apn="internet.wcc.net" user="3257630000" password="mmsc" type="default,supl" authtype="0" /> <apn carrier="WCW Internet" mcc="310" mnc="180" apn="internet.wcc.net" user="3257630000" password="mmsc" type="default,supl" authtype="0" />
<apn carrier="WCW-MMS" mcc="310" mnc="180" apn="mms.wcc.net" proxy="209.55.70.246" port="80" mmsc="http://mms.wcc.net" mmsproxy="209.55.70.246" mmsport="80" user="13257630000" password="mmsc" type="mms" authtype="3" /> <apn carrier="WCW-MMS" mcc="310" mnc="180" apn="mms.wcc.net" proxy="209.55.70.246" port="80" mmsc="http://mms.wcc.net" mmsproxy="209.55.70.246" mmsport="80" user="13257630000" password="mmsc" type="mms" authtype="3" />
<apn carrier="WCW-MMS only" mcc="310" mnc="180" apn="mms.wcc.net" proxy="209.55.70.244" port="80" mmsc="http://mms.wcc.net" mmsproxy="209.55.70.246" mmsport="80" user="3257630000" password="mmsc" type="default,mms" authtype="3" /> <apn carrier="WCW-MMS only" mcc="310" mnc="180" apn="mms.wcc.net" proxy="209.55.70.244" port="80" mmsc="http://mms.wcc.net" mmsproxy="209.55.70.246" mmsport="80" user="3257630000" password="mmsc" type="default,mms" authtype="3" />
<apn carrier="Ting Data" mcc="310" mnc="240" apn="wireless.dish.com" mmsc="http://wholesale.mmsmvno.com/mms/wapenc" protocol="IPV4V6" roaming_protocol="IPV4V6" type="default,admin,fota,mms,supl,hipri,internet,dun" /> <apn carrier="Ting Data" carrier_id="2523" mcc="310" mnc="240" apn="wireless.dish.com" mmsc="http://wholesale.mmsmvno.com/mms/wapenc" protocol="IPV4V6" roaming_protocol="IPV4V6" type="default,admin,fota,mms,supl,hipri,internet,dun" mvno_type="gid" mvno_match_data="6430" />
<apn carrier="Mint" mcc="310" mnc="240" apn="Wholesale" type="default,supl,mms,ia" mmsc="http://wholesale.mmsmvno.com/mms/wapenc" mmsport="8080" protocol="IPV4V6" roaming_protocol="IPV4V6" mvno_type="gid" mvno_match_data="756D" /> <apn carrier="Mint" mcc="310" mnc="240" apn="Wholesale" type="default,supl,mms,ia" mmsc="http://wholesale.mmsmvno.com/mms/wapenc" mmsport="8080" protocol="IPV4V6" roaming_protocol="IPV4V6" mvno_type="gid" mvno_match_data="756D" />
<apn carrier="T-Mobile US IMS" carrier_id="1" mcc="310" mnc="260" apn="ims" type="ims" protocol="IPV6" bearer_bitmask="14|20" mtu="1440" user_visible="false" /> <apn carrier="T-Mobile US IMS" carrier_id="1" mcc="310" mnc="260" apn="ims" type="ims" protocol="IPV6" bearer_bitmask="14|20" mtu="1440" user_visible="false" />
<apn carrier="T-Mobile US IMS" carrier_id="1" mcc="310" mnc="260" apn="ims" type="ims" protocol="IPV6" roaming_protocol="IPV6" bearer_bitmask="18" mtu="1440" user_visible="false" /> <apn carrier="T-Mobile US IMS" carrier_id="1" mcc="310" mnc="260" apn="ims" type="ims" protocol="IPV6" roaming_protocol="IPV6" bearer_bitmask="18" mtu="1440" user_visible="false" />

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 ba0aaa1b7d8c..b9ca7055d1b9 100644 index 13953d873c0f..62b5df33df15 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
@@ -4850,12 +4850,7 @@ public class ActivityManagerService extends IActivityManager.Stub @@ -4866,12 +4866,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/0018-Exec_Based_Spawning-14.patch
View File

@ -109,10 +109,10 @@ index 749c67abf389..39f08b6a0f15 100644
// classpath. If found, create a PathClassLoader and use it for applicationInit. // classpath. If found, create a PathClassLoader and use it for applicationInit.
ClassLoader classLoader = null; ClassLoader classLoader = null;
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 b9ca7055d1b9..9a2f0619431b 100644 index 62b5df33df15..58f379421c3e 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
@@ -18607,4 +18607,10 @@ public class ActivityManagerService extends IActivityManager.Stub @@ -18626,4 +18626,10 @@ public class ActivityManagerService extends IActivityManager.Stub
Trace.traceBegin(traceTag, methodName + subInfo); Trace.traceBegin(traceTag, methodName + subInfo);
} }
} }

26
Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
View File

@ -14,10 +14,10 @@ Change-Id: Ic01c97d6ceac8d324609763973639b41b4581a76
6 files changed, 56 deletions(-) 6 files changed, 56 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a3b2e43..d43a437 100644 index 44e8323..972ba36 100644
--- a/AndroidManifest.xml --- a/AndroidManifest.xml
+++ b/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -257,28 +257,6 @@ @@ -258,28 +258,6 @@
android:resource="@string/summary_empty" /> android:resource="@string/summary_empty" />
</activity-alias> </activity-alias>
@ -47,10 +47,10 @@ index a3b2e43..d43a437 100644
android:name=".profiles.NFCProfile" android:name=".profiles.NFCProfile"
android:exported="true"> android:exported="true">
diff --git a/proguard.flags b/proguard.flags diff --git a/proguard.flags b/proguard.flags
index 9de6495..911b751 100644 index cfbdae3..8991f2b 100644
--- a/proguard.flags --- a/proguard.flags
+++ b/proguard.flags +++ b/proguard.flags
@@ -7,7 +7,6 @@ @@ -11,7 +11,6 @@
-keep class org.lineageos.lineageparts.gestures.* -keep class org.lineageos.lineageparts.gestures.*
-keep class org.lineageos.lineageparts.hardware.* -keep class org.lineageos.lineageparts.hardware.*
-keep class org.lineageos.lineageparts.input.* -keep class org.lineageos.lineageparts.input.*
@ -59,11 +59,11 @@ index 9de6495..911b751 100644
-keep class org.lineageos.lineageparts.notificationlight.* -keep class org.lineageos.lineageparts.notificationlight.*
-keep class org.lineageos.lineageparts.power.* -keep class org.lineageos.lineageparts.power.*
diff --git a/res/values/config.xml b/res/values/config.xml diff --git a/res/values/config.xml b/res/values/config.xml
index a3ee437..c4532c5 100644 index adfcaa4..4c575f2 100644
--- a/res/values/config.xml --- a/res/values/config.xml
+++ b/res/values/config.xml +++ b/res/values/config.xml
@@ -17,9 +17,6 @@ @@ -6,9 +6,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Metrics server endpoint --> - <!-- Metrics server endpoint -->
@ -73,10 +73,10 @@ index a3ee437..c4532c5 100644
The array should be sorted in the same order as the The array should be sorted in the same order as the
touchscreen gestures advertised by the device's LineageHW impl. --> touchscreen gestures advertised by the device's LineageHW impl. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4c3a92d..9db0d06 100644 index 0358a7e..f6c27fc 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -550,28 +550,6 @@ @@ -543,28 +543,6 @@
<b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/> <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> <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
@ -106,10 +106,10 @@ index 4c3a92d..9db0d06 100644
<string name="accelerometer_title">Auto-rotate screen</string> <string name="accelerometer_title">Auto-rotate screen</string>
<string name="display_rotation_title">Rotation settings</string> <string name="display_rotation_title">Rotation settings</string>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 691ce47..ea2a07b 100644 index d6b19c0..e356517 100644
--- a/res/xml/parts_catalog.xml --- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml +++ b/res/xml/parts_catalog.xml
@@ -75,11 +75,6 @@ @@ -64,11 +64,6 @@
android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings" android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings"
lineage:xmlRes="@xml/status_bar_settings" /> lineage:xmlRes="@xml/status_bar_settings" />
@ -122,10 +122,10 @@ index 691ce47..ea2a07b 100644
android:title="@string/power_menu_title" android:title="@string/power_menu_title"
android:fragment="org.lineageos.lineageparts.input.PowerMenuActions" android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml
index 7cebff4..3b89030 100644 index f28a305..5b62c73 100644
--- a/res/xml/trust_preferences.xml --- a/res/xml/trust_preferences.xml
+++ b/res/xml/trust_preferences.xml +++ b/res/xml/trust_preferences.xml
@@ -47,9 +47,6 @@ @@ -36,9 +36,6 @@
android:entryValues="@array/trust_restrict_usb_values" android:entryValues="@array/trust_restrict_usb_values"
android:defaultValue="0" /> android:defaultValue="0" />

2
Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch
View File

@ -31,7 +31,7 @@ Change-Id: I5926493864d4b1291ae83f8b601bf5dcc54085cd
create mode 100644 hosts_cache.h create mode 100644 hosts_cache.h
diff --git a/Android.bp b/Android.bp diff --git a/Android.bp b/Android.bp
index 45425aa0..e843654c 100644 index b0cfee0c..35c47020 100644
--- a/Android.bp --- a/Android.bp
+++ b/Android.bp +++ b/Android.bp
@@ -164,6 +164,7 @@ cc_library { @@ -164,6 +164,7 @@ cc_library {

6
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh
View File

@ -80,13 +80,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4133/^6.3/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4623/4.12-^6.5/0001.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-28553/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31085/4.19/0003.patch editKernelLocalversion "-dos.p84"
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34324/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-42754/4.19/0003.patch
editKernelLocalversion "-dos.p86"
else echo "kernel_fxtec_sm6115 is unavailable, not patching."; else echo "kernel_fxtec_sm6115 is unavailable, not patching.";
fi; fi;
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

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

@ -110,10 +110,10 @@ buildAll() {
buildDevice hotdogb avb; buildDevice hotdogb avb;
buildDevice coral avb; buildDevice coral avb;
buildDevice flame avb; buildDevice flame avb;
buildDevice vayu avb; #buildDevice vayu avb; #XXX: no Wi-Fi
#SD730 #SD730
buildDevice sunfish avb; buildDevice sunfish avb;
buildDevice davinci avb; #buildDevice davinci avb; #XXX: no Wi-Fi
#SD632 #SD632
buildDevice FP3 avb; buildDevice FP3 avb;
#SD865 #SD865
@ -161,6 +161,7 @@ patchWorkspaceReal() {
source build/envsetup.sh; source build/envsetup.sh;
repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps
repopick -it T_asb_2023-11 -e 373323;
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

5
Scripts/LineageOS-20.0/Patch.sh
View File

@ -369,6 +369,7 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Connectivity/0001-Network_Perm
fi; fi;
if enterAndClear "packages/modules/DnsResolver"; then if enterAndClear "packages/modules/DnsResolver"; then
git fetch https://github.com/LineageOS/android_packages_modules_DnsResolver refs/changes/20/373320/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-11
applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch"; #DnsResolver: Sort and cache hosts file data for fast lookup (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch"; #DnsResolver: Sort and cache hosts file data for fast lookup (tdm)
applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch"; #DnsResolver: Support wildcards in cached hosts file (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch"; #DnsResolver: Support wildcards in cached hosts file (tdm)
applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0002-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0002-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS)
@ -387,6 +388,10 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0005-Browser_No_Loc
applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0006-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS) applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0006-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS)
fi; fi;
if enterAndClear "packages/modules/StatsD"; then
git fetch https://github.com/LineageOS/android_packages_modules_StatsD refs/changes/21/373321/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-11
fi;
if enterAndClear "packages/modules/Wifi"; then if enterAndClear "packages/modules/Wifi"; then
applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/344228.patch"; #wifi: resurrect mWifiLinkLayerStatsSupported counter (sassmann) applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/344228.patch"; #wifi: resurrect mWifiLinkLayerStatsSupported counter (sassmann)
applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS) applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)