Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-07-03 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Tad 2018-08-04 09:15:22 -04:00
parent 94f1382077
commit 4136ab17b8
5 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Manifests/Manifest_LAOS-15.1.xml
View File

@ -88,6 +88,10 @@
<project path="device/essential/mata" name="LineageOS/android_device_essential_mata" remote="github" /> <project path="device/essential/mata" name="LineageOS/android_device_essential_mata" remote="github" />
<project path="kernel/essential/msm8998" name="LineageOS/android_kernel_essential_msm8998" remote="github" /> <project path="kernel/essential/msm8998" name="LineageOS/android_kernel_essential_msm8998" remote="github" />
<!-- Fairphone 2 (FP2) -->
<project path="device/fairphone/FP2" name="LineageOS/android_device_fairphone_FP2" remote="github" />
<project path="kernel/fairphone/msm8974" name="LineageOS/android_kernel_fairphone_msm8974" remote="github" />
<!-- Google Pixel (marlin/sailfish) --> <!-- Google Pixel (marlin/sailfish) -->
<project path="device/google/marlin" name="LineageOS/android_device_google_marlin" remote="github" /> <project path="device/google/marlin" name="LineageOS/android_device_google_marlin" remote="github" />
<project path="device/google/sailfish" name="LineageOS/android_device_google_sailfish" remote="github" /> <project path="device/google/sailfish" name="LineageOS/android_device_google_sailfish" remote="github" />

56
Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch
View File

@ -1,15 +1,15 @@
From ed5cc62e6f0bccd5833be40d420e75cff720b2b2 Mon Sep 17 00:00:00 2001 From 5222539b3e662164074da8fbc5bcb0ec0db9b361 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us> From: Tad <tad@spotco.us>
Date: Wed, 28 Feb 2018 08:12:03 -0500 Date: Wed, 28 Feb 2018 08:12:03 -0500
Subject: [PATCH] Remove analytics Subject: [PATCH] Remove analytics
Change-Id: I189e9362c828569512e819cf655b03bfa3436830 Change-Id: I189e9362c828569512e819cf655b03bfa3436830
--- ---
res/layout/setup_lineage_settings.xml | 36 ---------------------- res/layout/setup_lineage_settings.xml | 36 -------------------
src/org/lineageos/setupwizard/FinishActivity.java | 12 -------- .../lineageos/setupwizard/FinishActivity.java | 12 -------
.../setupwizard/LineageSettingsActivity.java | 35 --------------------- .../setupwizard/LineageSettingsActivity.java | 31 ----------------
src/org/lineageos/setupwizard/SetupWizardApp.java | 1 - .../lineageos/setupwizard/SetupWizardApp.java | 1 -
4 files changed, 84 deletions(-) 4 files changed, 80 deletions(-)
diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml
index 42b4c2d..5792c06 100644 index 42b4c2d..5792c06 100644
@ -59,7 +59,7 @@ index 42b4c2d..5792c06 100644
<LinearLayout <LinearLayout
android:id="@+id/nav_keys" android:id="@+id/nav_keys"
diff --git a/src/org/lineageos/setupwizard/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java diff --git a/src/org/lineageos/setupwizard/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java
index d9c818d..fb2f6e5 100644 index 463e67d..74b0dba 100644
--- a/src/org/lineageos/setupwizard/FinishActivity.java --- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java +++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -20,7 +20,6 @@ package org.lineageos.setupwizard; @@ -20,7 +20,6 @@ package org.lineageos.setupwizard;
@ -70,7 +70,7 @@ index d9c818d..fb2f6e5 100644
import static org.lineageos.setupwizard.SetupWizardApp.LOGV; import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.animation.Animator; import android.animation.Animator;
@@ -173,7 +172,6 @@ public class FinishActivity extends BaseSetupWizardActivity { @@ -170,7 +169,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
mEnableAccessibilityController.onDestroy(); mEnableAccessibilityController.onDestroy();
} }
handlePrivacyGuard(mSetupWizardApp); handlePrivacyGuard(mSetupWizardApp);
@ -78,7 +78,7 @@ index d9c818d..fb2f6e5 100644
handleNavKeys(mSetupWizardApp); handleNavKeys(mSetupWizardApp);
final WallpaperManager wallpaperManager = final WallpaperManager wallpaperManager =
WallpaperManager.getInstance(mSetupWizardApp); WallpaperManager.getInstance(mSetupWizardApp);
@@ -184,16 +182,6 @@ public class FinishActivity extends BaseSetupWizardActivity { @@ -181,16 +179,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
startActivityForResult(intent, NEXT_REQUEST); startActivityForResult(intent, NEXT_REQUEST);
} }
@ -96,7 +96,7 @@ index d9c818d..fb2f6e5 100644
Bundle mPrivacyData = setupWizardApp.getSettingsBundle(); Bundle mPrivacyData = setupWizardApp.getSettingsBundle();
if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) { if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) {
diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
index 5970930..fab07db 100644 index d4579cf..dc3d4c8 100644
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java --- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java +++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@@ -19,7 +19,6 @@ package org.lineageos.setupwizard; @@ -19,7 +19,6 @@ package org.lineageos.setupwizard;
@ -107,37 +107,31 @@ index 5970930..fab07db 100644
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@@ -56,24 +55,13 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { @@ -55,18 +54,11 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
private SetupWizardApp mSetupWizardApp; private SetupWizardApp mSetupWizardApp;
- private View mMetricsRow;
private View mNavKeysRow;
private View mPrivacyGuardRow;
- private CheckBox mMetrics; - private CheckBox mMetrics;
private CheckBox mNavKeys; private CheckBox mNavKeys;
private CheckBox mPrivacyGuard; private CheckBox mPrivacyGuard;
private boolean mHideNavKeysRow = false; private boolean mHideNavKeysRow = false;
- private View.OnClickListener mMetricsClickListener = new View.OnClickListener() { - private View.OnClickListener mMetricsClickListener = view -> {
- @Override
- public void onClick(View view) {
- boolean checked = !mMetrics.isChecked(); - boolean checked = !mMetrics.isChecked();
- mMetrics.setChecked(checked); - mMetrics.setChecked(checked);
- mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, checked); - mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, checked);
- }
- }; - };
- -
private View.OnClickListener mNavKeysClickListener = new View.OnClickListener() { private View.OnClickListener mNavKeysClickListener = view -> {
@Override boolean checked = !mNavKeys.isChecked();
public void onClick(View view) { mNavKeys.setChecked(checked);
@@ -121,19 +109,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { @@ -108,19 +100,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance()); privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance());
privacyPolicy.setText(ss); privacyPolicy.setText(ss);
- mMetricsRow = findViewById(R.id.metrics); - View metricsRow = findViewById(R.id.metrics);
- mMetricsRow.setOnClickListener(mMetricsClickListener); - metricsRow.setOnClickListener(mMetricsClickListener);
- String metricsHelpImproveLineage = - String metricsHelpImproveLineage =
- getString(R.string.services_help_improve_cm, getString(R.string.os_name)); - getString(R.string.services_help_improve_cm, getString(R.string.os_name));
- String metricsSummary = getString(R.string.services_metrics_label, - String metricsSummary = getString(R.string.services_metrics_label,
@ -149,10 +143,10 @@ index 5970930..fab07db 100644
- metrics.setText(metricsSpan); - metrics.setText(metricsSpan);
- mMetrics = (CheckBox) findViewById(R.id.enable_metrics_checkbox); - mMetrics = (CheckBox) findViewById(R.id.enable_metrics_checkbox);
- -
mNavKeysRow = findViewById(R.id.nav_keys); View navKeysRow = findViewById(R.id.nav_keys);
mNavKeysRow.setOnClickListener(mNavKeysClickListener); navKeysRow.setOnClickListener(mNavKeysClickListener);
mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox); mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox);
@@ -162,7 +137,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { @@ -149,7 +128,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
updateDisableNavkeysOption(); updateDisableNavkeysOption();
@ -160,7 +154,7 @@ index 5970930..fab07db 100644
updatePrivacyGuardOption(); updatePrivacyGuardOption();
} }
@@ -197,15 +171,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { @@ -184,15 +162,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
return R.drawable.ic_features; return R.drawable.ic_features;
} }
@ -177,10 +171,10 @@ index 5970930..fab07db 100644
if (!mHideNavKeysRow) { if (!mHideNavKeysRow) {
final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle(); final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 62c1a20..4265493 100644 index 1a9318d..e362841 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java --- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java +++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -61,7 +61,6 @@ public class SetupWizardApp extends Application { @@ -60,7 +60,6 @@ public class SetupWizardApp extends Application {
public static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text"; public static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled"; public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
@ -189,5 +183,5 @@ index 62c1a20..4265493 100644
public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight"; public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
public static final String KEY_PRIVACY_GUARD = "privacy_guard_default"; public static final String KEY_PRIVACY_GUARD = "privacy_guard_default";
-- --
2.16.2 2.18.0

2
PrebuiltApps

@ -1 +1 @@
Subproject commit 4462248d9a7d8ae6b79067f3cd9d54cc36cb08a0 Subproject commit 6e74b7fe968d1f80f7239c06db6b363f03d3bdfa

8
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh
View File

@ -9,25 +9,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4578/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0611/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0611/3.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13305/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/^4.13/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16535/^4.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p29" editKernelLocalversion "-dos.p23"
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

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

@ -18,7 +18,7 @@
#Last verified: 2018-04-27 #Last verified: 2018-04-27
patchAllKernels() { patchAllKernels() {
startPatcher "kernel_asus_fugu kernel_brcm_rpi3 kernel_essential_msm8998 kernel_google_dragon kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_htc_msm8974 kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_universal9810"; startPatcher "kernel_asus_fugu kernel_brcm_rpi3 kernel_essential_msm8998 kernel_faitphone_msm8974 kernel_google_dragon kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_htc_msm8974 kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_universal9810";
} }
export -f patchAllKernels; export -f patchAllKernels;
@ -61,6 +61,7 @@ buildAll() {
brunch lineage_ether-user; brunch lineage_ether-user;
brunch lineage_flo-user; brunch lineage_flo-user;
brunch lineage_flounder-user; brunch lineage_flounder-user;
#brunch lineage_fp2-user; #still in bringup
brunch lineage_fugu-user; brunch lineage_fugu-user;
brunch lineage_griffin-user; brunch lineage_griffin-user;
brunch lineage_h850-user; brunch lineage_h850-user;