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

15.1: Updates & Fixes

Browse Source
This commit is contained in:
Tad 2018-04-19 21:26:11 -04:00
parent 4b04593376
commit a45a9be0e9
7 changed files with 161 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Manifests/Manifest_LAOS-15.1.xml
View File

@ -15,6 +15,7 @@
<remove-project name="LineageOS/android_external_htop" />
<remove-project name="LineageOS/android_external_libncurses" />
<remove-project name="LineageOS/android_external_nano" />
<remove-project name="LineageOS/android_external_openssh" />
<remove-project name="LineageOS/android_external_p7zip" />
<remove-project name="LineageOS/android_external_powertop" />
<remove-project name="LineageOS/android_external_rsync" />
@ -48,7 +49,6 @@
<remove-project name="LineageOS/scripts" />
<remove-project name="LineageOS/slackbot" />
<remove-project name="LineageOS/www" />
<remove-project name="platform/external/openssh" />
<remove-project name="platform/hardware/intel/audio_media" />
<remove-project name="platform/hardware/intel/bootstub" />
<remove-project name="platform/hardware/intel/common/bd_prov" />

128
Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics-Pre_Trust.patch Normal file
View File

@ -0,0 +1,128 @@
From 192de0fd289b2d22f4258745370fd13d68107b71 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 12 Feb 2018 03:10:11 -0500
Subject: [PATCH] Remove analytics
Change-Id: I9d1bcd4a6afa492bfc1e7a9e6f13875fda4353d2
---
AndroidManifest.xml | 25 -------------------------
proguard.flags | 1 -
res/values/config.xml | 3 ---
res/values/strings.xml | 22 ----------------------
res/xml/parts_catalog.xml | 5 -----
5 files changed, 56 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e2cd9b..e4a0d26 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -207,31 +207,6 @@
android:resource="@string/style_summary" />
</activity-alias>
- <!-- Anonymous Statistics -->
- <receiver android:name=".lineagestats.ReportingServiceManager"
- android:enabled="true"
- android:exported="false"
- android:label="ReportingServiceManager">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
- <action android:name="org.lineageos.lineageparts.action.TRIGGER_REPORT_METRICS" />
- </intent-filter>
- </receiver>
-
- <service android:label="ReportingService"
- android:enabled="true"
- android:exported="false"
- android:name=".lineagestats.ReportingService">
- </service>
-
- <service android:name=".lineagestats.StatsUploadJobService"
- android:permission="android.permission.BIND_JOB_SERVICE" />
-
- <service android:name=".lineagestats.ReportingService"
- android:label="ReportingService"
- android:enabled="true"
- android:exported="false" />
-
<!-- Weather settings -->
<activity-alias
android:name=".weather.WeatherServiceSettings"
diff --git a/proguard.flags b/proguard.flags
index 85e774a..db3507c 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -3,7 +3,6 @@
-keep class org.lineageos.lineageparts.*Picker
-keep class org.lineageos.lineageparts.*Settings
--keep class org.lineageos.lineageparts.lineagestats.*
-keep class org.lineageos.lineageparts.contributors.*
-keep class org.lineageos.lineageparts.hardware.*
-keep class org.lineageos.lineageparts.input.*
diff --git a/res/values/config.xml b/res/values/config.xml
index d49bab4..e510fdf 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,9 +17,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Metrics server endpoint -->
- <string name="stats_lineage_url">https://stats.lineageos.org/api/v1/stats</string>
-
<!-- When true, weather options will be displayed in settings dashboard -->
<bool name="config_showWeatherMenu">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f5b47b..173c133 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -537,28 +537,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>
- <!-- Anonymous Statistics #Lineage -->
- <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
- <string name="anonymous_statistics_title">LineageOS statistics</string>
- <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
- <string name="anonymous_statistics_warning_title">About</string>
- <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
- developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
- which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
- <string name="enable_reporting_title">Enable reporting</string>
- <string name="preview_data_title">Preview data</string>
- <string name="view_stats_title">View stats</string>
- <string name="anonymous_learn_more">Learn more</string>
-
- <!-- Anonymous Statistics - Preview -->
- <string name="preview_id_title">Unique ID</string>
- <string name="preview_device_title">Device</string>
- <string name="preview_version_title">Version</string>
- <string name="preview_country_title">Country</string>
- <string name="preview_carrier_title">Carrier</string>
- <string name="stats_collection_title">Stats collection</string>
- <string name="stats_collection_summary">Allow installation metrics and device statistics to be collected</string>
-
<!-- Display : Rotation -->
<string name="accelerometer_title">Auto-rotate screen</string>
<string name="display_rotation_title">Rotation settings</string>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index db18231..440e1aa 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -74,11 +74,6 @@
android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings"
lineage:xmlRes="@xml/status_bar_settings" />
- <part android:key="lineagestats"
- android:title="@string/anonymous_statistics_title"
- android:fragment="org.lineageos.lineageparts.lineagestats.AnonymousStats"
- lineage:xmlRes="@xml/anonymous_stats" />
-
<part android:key="power_menu"
android:title="@string/power_menu_title"
android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
--
2.16.1

45
Patches/LineageOS-15.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
View File

@ -1,23 +1,24 @@
From 192de0fd289b2d22f4258745370fd13d68107b71 Mon Sep 17 00:00:00 2001
From 0539b51319f6e28f5cc9b14f6477a8cb0a9e15b5 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 12 Feb 2018 03:10:11 -0500
Date: Thu, 19 Apr 2018 20:46:02 -0400
Subject: [PATCH] Remove analytics
Change-Id: I9d1bcd4a6afa492bfc1e7a9e6f13875fda4353d2
Change-Id: Idcc15bfeda4805b305423534663429942abd1bcf
---
AndroidManifest.xml | 25 -------------------------
proguard.flags | 1 -
res/values/config.xml | 3 ---
res/values/strings.xml | 22 ----------------------
res/xml/parts_catalog.xml | 5 -----
5 files changed, 56 deletions(-)
AndroidManifest.xml | 25 -------------------------
proguard.flags | 1 -
res/values/config.xml | 3 ---
res/values/strings.xml | 22 ----------------------
res/xml/parts_catalog.xml | 5 -----
res/xml/trust_preferences.xml | 2 --
6 files changed, 58 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e2cd9b..e4a0d26 100644
index 237db74..26d4a34 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -207,31 +207,6 @@
android:resource="@string/style_summary" />
@@ -251,31 +251,6 @@
android:resource="@string/expanded_desktop_settings_summary" />
</activity-alias>
- <!-- Anonymous Statistics -->
@ -75,10 +76,10 @@ index d49bab4..e510fdf 100644
<bool name="config_showWeatherMenu">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f5b47b..173c133 100644
index 0a3e654..8d744ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -537,28 +537,6 @@
@@ -535,28 +535,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>
@ -108,7 +109,7 @@ index 4f5b47b..173c133 100644
<string name="accelerometer_title">Auto-rotate screen</string>
<string name="display_rotation_title">Rotation settings</string>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index db18231..440e1aa 100644
index 5e2a106..d33e345 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -74,11 +74,6 @@
@ -123,6 +124,18 @@ index db18231..440e1aa 100644
<part android:key="power_menu"
android:title="@string/power_menu_title"
android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml
index 2e4e0a6..ee58ae4 100644
--- a/res/xml/trust_preferences.xml
+++ b/res/xml/trust_preferences.xml
@@ -44,7 +44,5 @@
<org.lineageos.internal.lineageparts.LineagePartsPreference
android:key="privacy_guard_manager" />
- <org.lineageos.internal.lineageparts.LineagePartsPreference
- android:key="lineagestats" />
</PreferenceCategory>
</PreferenceScreen>
--
2.16.1
2.17.0

14
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
View File

@ -24,7 +24,6 @@ git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0043.patch
git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0045.patch
git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0046.patch
git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0050.patch
git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0011.patch
git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0012.patch
git apply $cvePatchesLinux/CVE-2014-9900/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2015-2041/^3.19/0002.patch
@ -49,25 +48,14 @@ git apply $cvePatchesLinux/CVE-2017-0610/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11075/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11093/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-13162/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14880/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2017-14891/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14892/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15826/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15846/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15846/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0009.patch
git apply $cvePatchesLinux/CVE-2017-17769/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-18061/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-18066/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch
@ -83,5 +71,5 @@ git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p83"
editKernelLocalversion "-dos.p71"
cd $base

3
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
View File

@ -42,7 +42,6 @@ git apply $cvePatchesLinux/CVE-2017-11024/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14877/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch
git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch
git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch
@ -64,5 +63,5 @@ git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p64"
editKernelLocalversion "-dos.p63"
cd $base

1
Scripts/LineageOS-15.1/Functions.sh
View File

@ -59,6 +59,7 @@ patchWorkspace() {
repopick 209188; #g3-common cherry picks
repopick 211404 211405 211406 211407 211408 211409; #d852 cherry picks
repopick 205021; #d855 cherry picks
repopick -t trust_interface;
#repopick -t calendar-o;
source $scripts/Patch.sh;

1
Scripts/LineageOS-15.1/Patch.sh
View File

@ -128,7 +128,6 @@ enterAndClear "packages/apps/Settings"
git revert a96df110e84123fe1273bff54feca3b4ca484dcd #don't hide oem unlock
sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase max password length
sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; #MicroG doesn't support Backup, hide the options
patch -p1 < $patches"android_packages_apps_Settings/0002-Remove_Analytics.patch" #Remove analytics
enterAndClear "packages/apps/SetupWizard"
patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.patch" #Remove analytics