mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-09-06 17:42:25 +00:00
![Tad](/assets/img/avatar_default.png)
- No patches were found with incorrect authorship/From: lines - The older AndroidHardening patch repos are no longer available to verify CID. - New GrapheneOS patches do not include a CID. - *Signature_Spoofing.patch CID could not be found. - Fixed CID of *Harden_Sig_Spoofing.patch to match 14.1 - Fixed CID of *LGE_Fixes.patch to match 14.1 - Fixed CID of *Harden.patch to match 14.1 - Added edit note to *Harden.patch - Fixed CID of *PREREQ_Handle_All_Modes.patch to match 14.1 - Fixed CID of *More_Preferred_Network_Modes.patch to match 14.1 - Fixed CID of *AES256.patch to match 14.1 - Fixed CID of *0001-OTA_Keys.patch to match 18.1 - Fixed CID of *Camera_Fix.patch to match 15.1 - Fixed CID of *Connectivity.patch to match 14.1 - Fixed CID of *Fix_Calling.patch to match 14.1 - Fixed CID of *Remove_Analytics.patch to match 14.1 - Fixed CID of Unused-*.patch/audio_extn to match original Signed-off-by: Tad <tad@spotco.us>
178 lines
8.7 KiB
Diff
178 lines
8.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tad <tad@spotco.us>
|
|
Date: Fri, 3 Sep 2021 08:52:48 -0400
|
|
Subject: [PATCH] Remove analytics
|
|
|
|
Change-Id: I044dd6b137b8a1d4a6dde3a63c0aaa454309341f
|
|
---
|
|
res/layout/setup_lineage_settings.xml | 29 -----------------
|
|
.../lineageos/setupwizard/FinishActivity.java | 13 --------
|
|
.../setupwizard/LineageSettingsActivity.java | 31 -------------------
|
|
.../lineageos/setupwizard/SetupWizardApp.java | 1 -
|
|
4 files changed, 74 deletions(-)
|
|
|
|
diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml
|
|
index 1a3d1af..a7f7b55 100644
|
|
--- a/res/layout/setup_lineage_settings.xml
|
|
+++ b/res/layout/setup_lineage_settings.xml
|
|
@@ -59,35 +59,6 @@
|
|
style="@style/SudItemTitle.GlifDescription"
|
|
android:text="@string/services_find_privacy_policy" />
|
|
|
|
- <!-- Whether or not to enable metrics -->
|
|
- <LinearLayout
|
|
- android:id="@+id/metrics"
|
|
- android:orientation="horizontal"
|
|
- android:layout_width="match_parent"
|
|
- android:layout_height="wrap_content"
|
|
- android:paddingLeft="@dimen/location_margin_left"
|
|
- android:paddingRight="@dimen/content_margin_right"
|
|
- android:background="?android:attr/selectableItemBackground"
|
|
- android:clickable="true">
|
|
-
|
|
-
|
|
- <CheckBox
|
|
- android:id="@+id/enable_metrics_checkbox"
|
|
- android:layout_width="wrap_content"
|
|
- android:layout_height="wrap_content"
|
|
- android:duplicateParentState="true"
|
|
- android:clickable="false"
|
|
- style="@style/SudCheckBox.Multiline" />
|
|
-
|
|
- <TextView
|
|
- android:id="@+id/enable_metrics_summary"
|
|
- android:layout_width="wrap_content"
|
|
- android:layout_height="wrap_content"
|
|
- android:text="@string/services_metrics_label"
|
|
- style="@style/SudCheckBox.Multiline" />
|
|
-
|
|
- </LinearLayout>
|
|
-
|
|
<!-- Checkbox for using on-screen nav keys -->
|
|
<LinearLayout
|
|
android:id="@+id/nav_keys"
|
|
diff --git a/src/org/lineageos/setupwizard/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java
|
|
index f081e2b..1a9bbe9 100644
|
|
--- a/src/org/lineageos/setupwizard/FinishActivity.java
|
|
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
|
|
@@ -23,7 +23,6 @@ import static org.lineageos.setupwizard.Manifest.permission.FINISH_SETUP;
|
|
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_COMPLETE;
|
|
import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
|
|
import static org.lineageos.setupwizard.SetupWizardApp.ENABLE_RECOVERY_UPDATE;
|
|
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
|
|
import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
|
|
import static org.lineageos.setupwizard.SetupWizardApp.UPDATE_RECOVERY_PROP;
|
|
|
|
@@ -177,7 +176,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
|
|
if (mEnableAccessibilityController != null) {
|
|
mEnableAccessibilityController.onDestroy();
|
|
}
|
|
- handleEnableMetrics(mSetupWizardApp);
|
|
handleNavKeys(mSetupWizardApp);
|
|
handleRecoveryUpdate(mSetupWizardApp);
|
|
final WallpaperManager wallpaperManager =
|
|
@@ -190,17 +188,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
|
|
startActivityForResult(intent, NEXT_REQUEST);
|
|
}
|
|
|
|
- private static void handleEnableMetrics(SetupWizardApp setupWizardApp) {
|
|
- Bundle privacyData = setupWizardApp.getSettingsBundle();
|
|
- if (privacyData != null
|
|
- && privacyData.containsKey(KEY_SEND_METRICS)) {
|
|
- LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
|
|
- LineageSettings.Secure.STATS_COLLECTION,
|
|
- privacyData.getBoolean(KEY_SEND_METRICS)
|
|
- ? 1 : 0);
|
|
- }
|
|
- }
|
|
-
|
|
private static void handleNavKeys(SetupWizardApp setupWizardApp) {
|
|
if (setupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
|
|
writeDisableNavkeysOption(setupWizardApp,
|
|
diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
|
|
index e451c6b..79bef59 100644
|
|
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
|
|
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
|
|
@@ -18,7 +18,6 @@
|
|
package org.lineageos.setupwizard;
|
|
|
|
import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
|
|
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
|
|
|
|
import android.app.Activity;
|
|
import android.content.Context;
|
|
@@ -50,17 +49,10 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
|
|
|
|
private SetupWizardApp mSetupWizardApp;
|
|
|
|
- private CheckBox mMetrics;
|
|
private CheckBox mNavKeys;
|
|
|
|
private boolean mSupportsKeyDisabler = false;
|
|
|
|
- private final View.OnClickListener mMetricsClickListener = view -> {
|
|
- boolean checked = !mMetrics.isChecked();
|
|
- mMetrics.setChecked(checked);
|
|
- mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, checked);
|
|
- };
|
|
-
|
|
private final View.OnClickListener mNavKeysClickListener = view -> {
|
|
boolean checked = !mNavKeys.isChecked();
|
|
mNavKeys.setChecked(checked);
|
|
@@ -80,19 +72,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
|
|
((TextView) findViewById(R.id.privacy_policy)).setText(privacyPolicy);
|
|
((TextView) findViewById(R.id.find_privacy_policy)).setText(policySummary);
|
|
|
|
- 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,
|
|
- metricsHelpImproveLineage, getString(R.string.os_name));
|
|
- final SpannableStringBuilder metricsSpan = new SpannableStringBuilder(metricsSummary);
|
|
- metricsSpan.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
|
|
- 0, metricsHelpImproveLineage.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
- TextView metrics = (TextView) findViewById(R.id.enable_metrics_summary);
|
|
- metrics.setText(metricsSpan);
|
|
- mMetrics = (CheckBox) findViewById(R.id.enable_metrics_checkbox);
|
|
-
|
|
View navKeysRow = findViewById(R.id.nav_keys);
|
|
navKeysRow.setOnClickListener(mNavKeysClickListener);
|
|
mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox);
|
|
@@ -109,7 +88,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
|
|
public void onResume() {
|
|
super.onResume();
|
|
updateDisableNavkeysOption();
|
|
- updateMetricsOption();
|
|
}
|
|
|
|
@Override
|
|
@@ -133,15 +111,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
|
|
return R.drawable.ic_features;
|
|
}
|
|
|
|
- private void updateMetricsOption() {
|
|
- final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
|
|
- boolean metricsChecked =
|
|
- !myPageBundle.containsKey(KEY_SEND_METRICS) || myPageBundle
|
|
- .getBoolean(KEY_SEND_METRICS);
|
|
- mMetrics.setChecked(metricsChecked);
|
|
- myPageBundle.putBoolean(KEY_SEND_METRICS, metricsChecked);
|
|
- }
|
|
-
|
|
private void updateDisableNavkeysOption() {
|
|
if (mSupportsKeyDisabler) {
|
|
final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
|
|
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
|
|
index 38bba83..62d75f2 100644
|
|
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
|
|
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
|
|
@@ -60,7 +60,6 @@ public class SetupWizardApp extends Application {
|
|
public static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
|
|
|
|
public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
|
|
- public static final String KEY_SEND_METRICS = "send_metrics";
|
|
public static final String DISABLE_NAV_KEYS = "disable_nav_keys";
|
|
public static final String ENABLE_RECOVERY_UPDATE = "enable_recovery_update";
|
|
public static final String UPDATE_RECOVERY_PROP = "persist.vendor.recovery_update";
|