From 4136ab17b8b8fc303b0a7ea4343341e49c8f78b7 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 4 Aug 2018 09:15:22 -0400 Subject: [PATCH] Updates --- Manifests/Manifest_LAOS-15.1.xml | 4 ++ .../0001-Remove_Analytics.patch | 62 +++++++++---------- PrebuiltApps | 2 +- .../android_kernel_samsung_msm8974.sh | 8 +-- Scripts/LineageOS-15.1/Functions.sh | 3 +- 5 files changed, 36 insertions(+), 43 deletions(-) diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index 9331b569..2816b183 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -88,6 +88,10 @@ + + + + diff --git a/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch b/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch index 42114549..f62234e2 100644 --- a/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch +++ b/Patches/LineageOS-15.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch @@ -1,15 +1,15 @@ -From ed5cc62e6f0bccd5833be40d420e75cff720b2b2 Mon Sep 17 00:00:00 2001 +From 5222539b3e662164074da8fbc5bcb0ec0db9b361 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 28 Feb 2018 08:12:03 -0500 Subject: [PATCH] Remove analytics Change-Id: I189e9362c828569512e819cf655b03bfa3436830 --- - res/layout/setup_lineage_settings.xml | 36 ---------------------- - src/org/lineageos/setupwizard/FinishActivity.java | 12 -------- - .../setupwizard/LineageSettingsActivity.java | 35 --------------------- - src/org/lineageos/setupwizard/SetupWizardApp.java | 1 - - 4 files changed, 84 deletions(-) + res/layout/setup_lineage_settings.xml | 36 ------------------- + .../lineageos/setupwizard/FinishActivity.java | 12 ------- + .../setupwizard/LineageSettingsActivity.java | 31 ---------------- + .../lineageos/setupwizard/SetupWizardApp.java | 1 - + 4 files changed, 80 deletions(-) diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml index 42b4c2d..5792c06 100644 @@ -59,7 +59,7 @@ index 42b4c2d..5792c06 100644 { +- boolean checked = !mMetrics.isChecked(); +- mMetrics.setChecked(checked); +- mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, checked); - }; - - private View.OnClickListener mNavKeysClickListener = new View.OnClickListener() { - @Override - public void onClick(View view) { -@@ -121,19 +109,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { + private View.OnClickListener mNavKeysClickListener = view -> { + boolean checked = !mNavKeys.isChecked(); + mNavKeys.setChecked(checked); +@@ -108,19 +100,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance()); privacyPolicy.setText(ss); -- mMetricsRow = findViewById(R.id.metrics); -- mMetricsRow.setOnClickListener(mMetricsClickListener); +- View metricsRow = findViewById(R.id.metrics); +- metricsRow.setOnClickListener(mMetricsClickListener); - String metricsHelpImproveLineage = - getString(R.string.services_help_improve_cm, getString(R.string.os_name)); - String metricsSummary = getString(R.string.services_metrics_label, @@ -149,10 +143,10 @@ index 5970930..fab07db 100644 - metrics.setText(metricsSpan); - mMetrics = (CheckBox) findViewById(R.id.enable_metrics_checkbox); - - mNavKeysRow = findViewById(R.id.nav_keys); - mNavKeysRow.setOnClickListener(mNavKeysClickListener); + View navKeysRow = findViewById(R.id.nav_keys); + navKeysRow.setOnClickListener(mNavKeysClickListener); 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() { super.onResume(); updateDisableNavkeysOption(); @@ -160,7 +154,7 @@ index 5970930..fab07db 100644 updatePrivacyGuardOption(); } -@@ -197,15 +171,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { +@@ -184,15 +162,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { return R.drawable.ic_features; } @@ -177,10 +171,10 @@ index 5970930..fab07db 100644 if (!mHideNavKeysRow) { final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle(); 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 +++ 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 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_PRIVACY_GUARD = "privacy_guard_default"; -- -2.16.2 +2.18.0 diff --git a/PrebuiltApps b/PrebuiltApps index 4462248d..6e74b7fe 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 4462248d9a7d8ae6b79067f3cd9d54cc36cb08a0 +Subproject commit 6e74b7fe968d1f80f7239c06db6b363f03d3bdfa diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 5f8eb651..2e835420 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -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-0750/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-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-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/0005.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-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-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/CVE-2016-2475/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" diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index dde47d56..1b48a897 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2018-04-27 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; @@ -61,6 +61,7 @@ buildAll() { brunch lineage_ether-user; brunch lineage_flo-user; brunch lineage_flounder-user; + #brunch lineage_fp2-user; #still in bringup brunch lineage_fugu-user; brunch lineage_griffin-user; brunch lineage_h850-user;